tt: Fixup tt build for new includes locations

Some files were trying to access the global includes directy in the
build area with things like #include <api/c/tt_c.h>, which is now
wrong.  Se we fix all of those up.  tt_c.h and tttk.h are now global,
so we no longer need to root around various build dirs to find them.

TT builds again.

diff --git a/cde/lib/tt/bin/shell/copier.C b/cde/lib/tt/bin/shell/copier.C
index 176184b1b074789e23537a3b5d2da1df3d4457b4..f48aedca43005b390bdf44471022ea433ecd68e6 100644 (file)
--- a/cde/lib/tt/bin/shell/copier.C
+++ b/cde/lib/tt/bin/shell/copier.C
@@ -41,7 +41,7 @@
 #include <sys/wait.h>
 #include <sys/param.h>
 #include <errno.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_path.h"
 #include "util/tt_gettext.h"
 #include "util/copyright.h"

diff --git a/cde/lib/tt/bin/shell/copier.h b/cde/lib/tt/bin/shell/copier.h
index e645b9ad47dc075267a3f4c42ed6a26855e7a454..b669357629c29568623a47fab587cb702d4626d8 100644 (file)
--- a/cde/lib/tt/bin/shell/copier.h
+++ b/cde/lib/tt/bin/shell/copier.h
@@ -35,7 +35,7 @@
 #ifndef _COPIER_H
 #define _COPIER_H
 
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <util/tt_string.h>
 
 class copier : public _Tt_object {

diff --git a/cde/lib/tt/bin/shell/mover.C b/cde/lib/tt/bin/shell/mover.C
index 94c72ea13aa11ac94f67ff94a556d7055632377a..7a70a0973d20e2491812ab1fa1871bd81c1a65b9 100644 (file)
--- a/cde/lib/tt/bin/shell/mover.C
+++ b/cde/lib/tt/bin/shell/mover.C
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_gettext.h"
 #include "util/copyright.h"
 #include "mover.h"

diff --git a/cde/lib/tt/bin/shell/mover.h b/cde/lib/tt/bin/shell/mover.h
index 780cb200208246c907508df5efaf4ad9b6470296..3a38ddbf02a788e3966e62038c35b11f56e2c4c4 100644 (file)
--- a/cde/lib/tt/bin/shell/mover.h
+++ b/cde/lib/tt/bin/shell/mover.h
@@ -35,7 +35,7 @@
 #ifndef _MOVER_H
 #define _MOVER_H
 
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <util/tt_string.h>
 
 class mover : public _Tt_object {

diff --git a/cde/lib/tt/bin/shell/rcopier.C b/cde/lib/tt/bin/shell/rcopier.C
index 91b1b5db3de0dc1cedf1c92042c6bfd43832c979..ff74b9f1c36a1d43b40838e91fcae29750f609e6 100644 (file)
--- a/cde/lib/tt/bin/shell/rcopier.C
+++ b/cde/lib/tt/bin/shell/rcopier.C
@@ -38,7 +38,7 @@
 #if defined(OPT_BUG_SUNOS_4)
 #      include <stdlib.h>
 #endif
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <util/tt_path.h>
 #include <util/tt_enumname.h>
 #include <util/copyright.h>

diff --git a/cde/lib/tt/bin/shell/rcopier.h b/cde/lib/tt/bin/shell/rcopier.h
index 69a6b85a93e479f98a9d75965951bd92bb7d991a..6dc385d517fb390e94861a99b74ba4ad45e3f75d 100644 (file)
--- a/cde/lib/tt/bin/shell/rcopier.h
+++ b/cde/lib/tt/bin/shell/rcopier.h
@@ -35,7 +35,7 @@
 #ifndef _RCOPIER_H
 #define _RCOPIER_H
 
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <util/tt_string.h>
 
 class rpath : public _Tt_object {

diff --git a/cde/lib/tt/bin/shell/remover.C b/cde/lib/tt/bin/shell/remover.C
index bb0c92146ae27c91fdf0dc2fdbe6cf0b3f1172a5..d677c9b2a59fea73862c4e71360394c90e4929a0 100644 (file)
--- a/cde/lib/tt/bin/shell/remover.C
+++ b/cde/lib/tt/bin/shell/remover.C
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_path.h"
 #include "util/tt_gettext.h"
 #include "util/copyright.h"

diff --git a/cde/lib/tt/bin/shell/remover.h b/cde/lib/tt/bin/shell/remover.h
index d5f6a7632e0c3aa47deaeb8585f5747f169451f4..0b8b6ba8c5d21c5b1bfad1caa84229898a914909 100644 (file)
--- a/cde/lib/tt/bin/shell/remover.h
+++ b/cde/lib/tt/bin/shell/remover.h
@@ -35,7 +35,7 @@
 #ifndef _REMOVER_H
 #define _REMOVER_H
 
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <util/tt_string.h>
 
 class remover : public _Tt_object {

diff --git a/cde/lib/tt/bin/ttauth/process.c b/cde/lib/tt/bin/ttauth/process.c
index cffe65c25a46c150e1c6fd686e67b0e9b4848b92..99a5b15ced2a12f96596a4eca7eca7452edf20f9 100644 (file)
--- a/cde/lib/tt/bin/ttauth/process.c
+++ b/cde/lib/tt/bin/ttauth/process.c
@@ -61,7 +61,7 @@ extern int errno;
 #endif
 #include "ttauth.h"
 #include "api/c/api_auth.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 
 #include <signal.h>
 

diff --git a/cde/lib/tt/bin/ttauth/ttauth.c b/cde/lib/tt/bin/ttauth/ttauth.c
index 2453cc9f7a985de70ff6b44caf4457d75551d8ce..10e0e95b5bcac84206332d149a0585a4def13407 100644 (file)
--- a/cde/lib/tt/bin/ttauth/ttauth.c
+++ b/cde/lib/tt/bin/ttauth/ttauth.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
  */
 
 #include "ttauth.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 
 
 /*

diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
index d71b4f55fd3c0198f834b8cb2a0140ae5881f80f..10f3270ad753c9cce5e6a76421a13819ae38f8b2 100644 (file)
--- a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
+++ b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
@@ -45,7 +45,7 @@
 #include <unistd.h>
 #include <nl_types.h>
 
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_file_system.h"
 #include "util/tt_file_system_entry.h"
 #include "util/tt_path.h"

diff --git a/cde/lib/tt/bin/tttar/archiver.C b/cde/lib/tt/bin/tttar/archiver.C
index 9c3aa8e5177d7d0339f201f5f18545dfb16599f2..ae97951808b29c40d2936dbb3a5419cd6abda8bd 100644 (file)
--- a/cde/lib/tt/bin/tttar/archiver.C
+++ b/cde/lib/tt/bin/tttar/archiver.C
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/copyright.h"
 #include "util/tt_gettext.h"
 #include "tttar_utils.h"

diff --git a/cde/lib/tt/bin/tttar/archiver.h b/cde/lib/tt/bin/tttar/archiver.h
index d5879631efa0aa6a83a4c7bda846e18e51b2f94e..2919d9158d98b73f2bcfcf1ba6bad8518a870a41 100644 (file)
--- a/cde/lib/tt/bin/tttar/archiver.h
+++ b/cde/lib/tt/bin/tttar/archiver.h
@@ -35,7 +35,7 @@
 #ifndef _ARCHIVER_H
 #define _ARCHIVER_H
 
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <util/tt_string.h>
 #include "tttar_string_map.h"
 

diff --git a/cde/lib/tt/bin/tttar/tttar_api.C b/cde/lib/tt/bin/tttar/tttar_api.C
index f24af18a835a1c1aed6e155ae2bb0aad38a86651..e742c3a83a94545b045ea83f0d5b5eaa5f573a31 100644 (file)
--- a/cde/lib/tt/bin/tttar/tttar_api.C
+++ b/cde/lib/tt/bin/tttar/tttar_api.C
@@ -40,7 +40,7 @@
 #endif
 #include <sys/param.h>
 #include "api/c/api_api.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_path.h"
 #include "util/tt_gettext.h"
 #include "tttar_utils.h"

diff --git a/cde/lib/tt/bin/tttar/tttar_spec.C b/cde/lib/tt/bin/tttar/tttar_spec.C
index cf3574619f7c47dd86da2464938c5318707a5d97..bee2cb13d068fdfbd2443da6f0fcad1032ed1f38 100644 (file)
--- a/cde/lib/tt/bin/tttar/tttar_spec.C
+++ b/cde/lib/tt/bin/tttar/tttar_spec.C
@@ -37,7 +37,7 @@
 #else
 #include <osfcn.h>
 #endif
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_iostream.h"
 #include "tttar_utils.h"
 #include "tttar_spec.h"

diff --git a/cde/lib/tt/bin/tttar/tttar_utils.C b/cde/lib/tt/bin/tttar/tttar_utils.C
index a0d4aaa4d7824e4a06529e0ce15feb05cb3cbf0c..bb27b63572adfb3239870cb361490c147a867b64 100644 (file)
--- a/cde/lib/tt/bin/tttar/tttar_utils.C
+++ b/cde/lib/tt/bin/tttar/tttar_utils.C
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <util/tt_enumname.h>
 #include "tttar_utils.h"
 

diff --git a/cde/lib/tt/bin/tttar/tttar_utils.h b/cde/lib/tt/bin/tttar/tttar_utils.h
index bd917a2c81e27cbe902d37eeae50002b08ae04ee..a0c6327f7f495a60744b4fbdb54b1fe96d5709a3 100644 (file)
--- a/cde/lib/tt/bin/tttar/tttar_utils.h
+++ b/cde/lib/tt/bin/tttar/tttar_utils.h
@@ -34,7 +34,7 @@
 #ifndef        _LSTAR_UTILS_H
 #define        _LSTAR_UTILS_H
 
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <util/tt_string.h>
 
 

diff --git a/cde/lib/tt/bin/tttrace/tttrace.C b/cde/lib/tt/bin/tttrace/tttrace.C
index 346bfc93fcce9b62208b40175e6dc9c167d33734..8012996ad32f592b206b2e520614ec44be83519c 100644 (file)
--- a/cde/lib/tt/bin/tttrace/tttrace.C
+++ b/cde/lib/tt/bin/tttrace/tttrace.C
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_string.h"
 #include "util/tt_port.h"
 #include "util/tt_gettext.h"

diff --git a/cde/lib/tt/lib/api/c/Makefile.am b/cde/lib/tt/lib/api/c/Makefile.am
index a249ceb113ce6b6491a2c9e10933ede8c9d68cc7..67b1a470a076a5229ec189221a9374c28498a27d 100644 (file)
--- a/cde/lib/tt/lib/api/c/Makefile.am
+++ b/cde/lib/tt/lib/api/c/Makefile.am
@@ -4,8 +4,6 @@ MAINTAINERCLEANFILES = Makefile.in
 
 include ../../../tooltalk.inc
 
-tt_HEADERS = tt_c.h
-
 noinst_LTLIBRARIES = libapi.la
 
 libapi_la_CXXFLAGS = $(TIRPCINC) -I../../../lib

diff --git a/cde/lib/tt/lib/api/c/api_api.C b/cde/lib/tt/lib/api/c/api_api.C
index 3f83958f8dca1c36f83f0148b5513c424bb08b6b..0d2074a52aa9643b46e53bc7fc21dded04b1b62e 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_api.C
+++ b/cde/lib/tt/lib/api/c/api_api.C
@@ -43,7 +43,7 @@
 #include <memory.h>
 #include <errno.h>
 #include "mp/mp_c.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_mp.h"
 #include "api/c/api_storage.h"

diff --git a/cde/lib/tt/lib/api/c/api_api.h b/cde/lib/tt/lib/api/c/api_api.h
index 5878113de9f718ea0d92c64961abc6875d898d0c..297c6d79b0a0abdd188e59515c73e8ca5fa32a24 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_api.h
+++ b/cde/lib/tt/lib/api/c/api_api.h
@@ -35,7 +35,7 @@
  */
 #if !defined(_TT_API_API_H)
 #define _TT_API_API_H
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_string.h"
 extern char _tt_api_status_page[(int)TT_STATUS_LAST];
 

diff --git a/cde/lib/tt/lib/api/c/api_auth.C b/cde/lib/tt/lib/api/c/api_auth.C
index 1bd4f8fa50b547e6c3fb6d319663fb70ce440d0a..4c9a1a92f6c8451b2e381afb947c3a6e2a016838 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_auth.C
+++ b/cde/lib/tt/lib/api/c/api_auth.C
@@ -36,7 +36,7 @@
  * some file named api_mp_*.cc.
  */
 
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_auth.h"
 
 char *

diff --git a/cde/lib/tt/lib/api/c/api_default.C b/cde/lib/tt/lib/api/c/api_default.C
index aff922af9814bea2a9adfe4edecfcc7ee9361e84..a3a4d741d9b5a4ce64c8c2327b33fb3ef0d48e06 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_default.C
+++ b/cde/lib/tt/lib/api/c/api_default.C
@@ -34,7 +34,7 @@
 #include "db/tt_db_file.h"
 #include "mp/mp_c.h"
 #include "util/tt_path.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_mp.h"
 #include <util/tt_audit.h>

diff --git a/cde/lib/tt/lib/api/c/api_error.h b/cde/lib/tt/lib/api/c/api_error.h
index 454a5e25856717a3fbd35572b1749484bb575e67..c5609add52c115abe8cc8bd0553a4e61b65e6ba5 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_error.h
+++ b/cde/lib/tt/lib/api/c/api_error.h
@@ -37,7 +37,7 @@
 #define _API_ERROR_H
 
 #include "db/tt_db_results.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 
 typedef enum api_module {_TT_API_SPEC, // tt_spec_ calls
                         _TT_API_FILE,  // tt_file_ calls

diff --git a/cde/lib/tt/lib/api/c/api_file.C b/cde/lib/tt/lib/api/c/api_file.C
index cd42acca22cdb7376f2170970de19de8ba659251..153eb15fe83e5dc11dc64b885e271e18a517ab9b 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_file.C
+++ b/cde/lib/tt/lib/api/c/api_file.C
@@ -33,7 +33,7 @@
  */
 
 #include "mp/mp_c.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_error.h"
 #include "api/c/api_mp.h"

diff --git a/cde/lib/tt/lib/api/c/api_filemap.C b/cde/lib/tt/lib/api/c/api_filemap.C
index 7efdb03b264f89f2c7e7d59c04b6c377c32beb90..2728db50095d2bc78057f479837ede97c1fe4c86 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_filemap.C
+++ b/cde/lib/tt/lib/api/c/api_filemap.C
@@ -43,7 +43,7 @@
 #include "db/tt_db_file.h"
 #include "mp/mp_c.h"
 #include "util/tt_path.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_mp.h"
 #include "api/c/api_error.h"

diff --git a/cde/lib/tt/lib/api/c/api_filemap.h b/cde/lib/tt/lib/api/c/api_filemap.h
index 3ca3b5494af4775747ce5155d2ea4353569a8632..9537642fbd59814f48fa958384616168f6e556a9 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_filemap.h
+++ b/cde/lib/tt/lib/api/c/api_filemap.h
@@ -39,7 +39,7 @@
 #ifndef _TT_API_FILEMAP_H
 #define _TT_API_FILEMAP_H
 
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_string.h"
 
 class _Tt_api_filename_map : public _Tt_object  {

diff --git a/cde/lib/tt/lib/api/c/api_message.C b/cde/lib/tt/lib/api/c/api_message.C
index 99e7e0dc6502ac00ec4f7d2da83ab44d3fb51f5b..104608ae88cd5a65b7db09148042c881e73082fd 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_message.C
+++ b/cde/lib/tt/lib/api/c/api_message.C
@@ -38,7 +38,7 @@
 #include "mp/mp_msg_context.h"
 #include "util/tt_path.h"
 #include "util/tt_audit.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_xdr.h"
 #include "api/c/api_mp.h"

diff --git a/cde/lib/tt/lib/api/c/api_mp.C b/cde/lib/tt/lib/api/c/api_mp.C
index 05f1719d1c5f680320bddca930182b5730c89ea7..87cacc515da0e7e9e6802ef7e18dbb20884ebdd7 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_mp.C
+++ b/cde/lib/tt/lib/api/c/api_mp.C
@@ -40,7 +40,7 @@
 #include "db/tt_old_db_partition_map_ref.h"
 #include "mp/mp_c_global.h"
 #include "mp/mp_c.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_mp.h"
 #include "api/c/api_handle.h"

diff --git a/cde/lib/tt/lib/api/c/api_mp.h b/cde/lib/tt/lib/api/c/api_mp.h
index b5d6085eb1d419d8ebfba337ca765e6db8a17edb..c368bc67bb69caeb5f502be1c4acbd687bdfbc0f 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_mp.h
+++ b/cde/lib/tt/lib/api/c/api_mp.h
@@ -32,7 +32,7 @@
  */
 #ifndef _TT_API_MP_H
 #define _TT_API_MP_H
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <util/tt_string.h>
 
 

diff --git a/cde/lib/tt/lib/api/c/api_mp_otype.C b/cde/lib/tt/lib/api/c/api_mp_otype.C
index 7f7f258178e7984777b2c92ddb2c8c8477e68c52..dc3637efff8031240962d0a659c4b8b61abcb95e 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_mp_otype.C
+++ b/cde/lib/tt/lib/api/c/api_mp_otype.C
@@ -38,7 +38,7 @@
 
 #include "mp/mp_c.h"
 #include "mp/mp_rpc_interface.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_mp.h"
 #include "api/c/api_handle.h"

diff --git a/cde/lib/tt/lib/api/c/api_pattern.C b/cde/lib/tt/lib/api/c/api_pattern.C
index dc0e73e34125dca26fb182d0045ee8db53944c88..8c85adc0fb81ec65cf9a8c7532876dfdac1b7380 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_pattern.C
+++ b/cde/lib/tt/lib/api/c/api_pattern.C
@@ -38,7 +38,7 @@
 #include "mp/mp_c.h"
 #include "mp/mp_pat_context.h"
 #include "mp/mp_c_msg_context.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_mp.h"
 #include "api/c/api_handle.h"

diff --git a/cde/lib/tt/lib/api/c/api_session_prop.C b/cde/lib/tt/lib/api/c/api_session_prop.C
index 44fce568be0939c2a2c831277047f844ad1f23a6..c2c564ea5f173fcccd4badb2b3755f350b5cb171 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_session_prop.C
+++ b/cde/lib/tt/lib/api/c/api_session_prop.C
@@ -33,7 +33,7 @@
  */
 
 #include "mp/mp_c.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_mp.h"
 #include "api/c/api_handle.h"

diff --git a/cde/lib/tt/lib/api/c/api_spec.C b/cde/lib/tt/lib/api/c/api_spec.C
index 333303235462def8c62d76759fb0e5aaba880595..bade071d1ba4232b44424c050fad082334b27559 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_spec.C
+++ b/cde/lib/tt/lib/api/c/api_spec.C
@@ -35,7 +35,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "mp/mp_c.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "api/c/api_mp.h"
 #include "api/c/api_handle.h"

diff --git a/cde/lib/tt/lib/api/c/api_typecb.h b/cde/lib/tt/lib/api/c/api_typecb.h
index 293cb5c9cc63e3201c79855b44c3d515c39be8c9..8f75815379c1b38bcf675b97447b785adcf23418 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_typecb.h
+++ b/cde/lib/tt/lib/api/c/api_typecb.h
@@ -41,7 +41,7 @@
 #define _API_TYPECB_H
 
 #include "util/tt_object.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_handle.h"
 
 #if defined(__linux__)

diff --git a/cde/lib/tt/lib/api/dnd/ttdnd.c b/cde/lib/tt/lib/api/dnd/ttdnd.c
index 18a4b9972ac7db24f5723bdf664863394abdaf3b..ef635d77e1ddfc6fd9384f61f8d2bed6ddbf9a39 100644 (file)
--- a/cde/lib/tt/lib/api/dnd/ttdnd.c
+++ b/cde/lib/tt/lib/api/dnd/ttdnd.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "ttdnd.h"
 
 static Tt_callback_action      _ttdnd_get_contents_callback();

diff --git a/cde/lib/tt/lib/db/old_db_server_functions.C b/cde/lib/tt/lib/db/old_db_server_functions.C
index c42b0a2e7a595ca5f5050af17cb5abc8ccc129cd..50f288a1f6784fa0092aa5d36482b28888dbb9da 100644 (file)
--- a/cde/lib/tt/lib/db/old_db_server_functions.C
+++ b/cde/lib/tt/lib/db/old_db_server_functions.C
@@ -52,7 +52,7 @@
 #include "db/tt_old_db_partition_map_ref.h"
 #include "db/tt_old_db_consts.h"
 #include "db/tt_old_db_utils.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 
 static void _old_tt_close_db_partition_files (const _Tt_string&);
 static bool_t _old_tt_is_file_a_directory (const _Tt_string&);

diff --git a/cde/lib/tt/lib/db/tt_old_db.C b/cde/lib/tt/lib/db/tt_old_db.C
index c2fb319177c3ba42a3f695297f37dcb1c0952445..1d1a6c781bae60805ac94902d6d44d5907108c53 100644 (file)
--- a/cde/lib/tt/lib/db/tt_old_db.C
+++ b/cde/lib/tt/lib/db/tt_old_db.C
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_port.h"
 #include "util/tt_gettext.h"
 #include "db/tt_old_db_consts.h"

diff --git a/cde/lib/tt/lib/dm/dm_enums.h b/cde/lib/tt/lib/dm/dm_enums.h
index e282257ca76e2dd32cb039cc1bf7d91221b825bc..5f51321c23d8a78f85467c8859826028c45c7a36 100644 (file)
--- a/cde/lib/tt/lib/dm/dm_enums.h
+++ b/cde/lib/tt/lib/dm/dm_enums.h
@@ -41,7 +41,7 @@
 #if defined(OPT_BUG_SUNOS_4) && defined(__GNUG__)
 #      include <stdlib.h>
 #endif
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 
 const int VER_NO_LENGTH = 4;
 const int INITIAL_VERSION_NO = 0;

diff --git a/cde/lib/tt/lib/mp/mp_context.h b/cde/lib/tt/lib/mp/mp_context.h
index ccdc340dd4a629382d4902411656230eb6f0deb2..f100cee667411c1f297c5beae799dfd8e5498b2e 100644 (file)
--- a/cde/lib/tt/lib/mp/mp_context.h
+++ b/cde/lib/tt/lib/mp/mp_context.h
@@ -42,7 +42,7 @@
 
 #include <util/tt_object.h>
 #include <util/tt_string.h>
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include <rpc/rpc.h>
 
 class _Tt_context : public _Tt_object {

diff --git a/cde/lib/tt/lib/mp/mp_global.h b/cde/lib/tt/lib/mp/mp_global.h
index e4799d4a0ec268f06d0a10646af5c5cd53de69f0..143df1ff17222e2772fb209423795fae2ec30178 100644 (file)
--- a/cde/lib/tt/lib/mp/mp_global.h
+++ b/cde/lib/tt/lib/mp/mp_global.h
@@ -40,7 +40,7 @@
 #include "util/tt_list.h"
 #include "util/tt_string.h"
 #include "mp/mp_xdr_functions.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 
 #define _TT_TYPES_CE_VERSION 1
 #define _TT_XATOM_VERSION 1

diff --git a/cde/lib/tt/lib/mp/mp_xdr_functions.h b/cde/lib/tt/lib/mp/mp_xdr_functions.h
index de084f845aa28ecbadf411635f2fd011d98c81f8..6ecc6400487ff2a5e148eb772d1afe932c9953f8 100644 (file)
--- a/cde/lib/tt/lib/mp/mp_xdr_functions.h
+++ b/cde/lib/tt/lib/mp/mp_xdr_functions.h
@@ -42,7 +42,7 @@
 
 #include <stdlib.h>
 #include <rpc/rpc.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_string.h"
 #include "mp/mp_auth.h"
 #include "mp/mp_file_utils.h"

diff --git a/cde/lib/tt/lib/tttk/Makefile.am b/cde/lib/tt/lib/tttk/Makefile.am
index 15085884abec557ba503e715433b753c633c7732..8540371acd9dbf68939887692f09c417b2b908ff 100644 (file)
--- a/cde/lib/tt/lib/tttk/Makefile.am
+++ b/cde/lib/tt/lib/tttk/Makefile.am
@@ -4,22 +4,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 include ../../tooltalk.inc
 
-header_HEADERS = tttk.h
-
 noinst_LTLIBRARIES = libtttk.la
 
-# We need to build a symlink to ../api/c/ so that contructs like
-# include <Tt/somefile.h> can work, since we no longer have a global
-# 'includes' phase during the build that installes include files
-# similiar to what you would expect if they were installed on the
-# system.
-
-BUILT_SOURCES = Tt
-CLEANFILES = Tt
-Tt: Makefile
-       $(RM) Tt
-       $(LN_S) ../api/c Tt
-
 libtttk_la_CXXFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE) -I../ -I../../lib
 
 libtttk_la_SOURCES = ttdesktop.C     ttdtfile.C      ttdtprocid.C \

diff --git a/cde/lib/tt/lib/tttk/ttdesktop.C b/cde/lib/tt/lib/tttk/ttdesktop.C
index 68794db70d99c4edc67028137ddbaab5ce60a96b..a352cfe74b811cb35a17dc78a219266a11eea843 100644 (file)
--- a/cde/lib/tt/lib/tttk/ttdesktop.C
+++ b/cde/lib/tt/lib/tttk/ttdesktop.C
@@ -49,11 +49,11 @@
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
 #include "util/tt_Xlib.h"
 #include "util/tt_port.h"
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 #include "tttk/tttk2free.h"
 #include "tttk/tttkutils.h"
 #include "tttk/tttkmessage.h"

diff --git a/cde/lib/tt/lib/tttk/ttdesktop.h b/cde/lib/tt/lib/tttk/ttdesktop.h
index 7d4f7083878893d241a4d99f6647452b99b32ab1..581d9177e3ec937164c54beb9da7ee7d55b7481b 100644 (file)
--- a/cde/lib/tt/lib/tttk/ttdesktop.h
+++ b/cde/lib/tt/lib/tttk/ttdesktop.h
@@ -33,7 +33,7 @@
 #ifndef ttdesktop_h
 #define ttdesktop_h
 
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 #include "tttk/tttkmessage.h"
 
 typedef struct {

diff --git a/cde/lib/tt/lib/tttk/ttdtfile.C b/cde/lib/tt/lib/tttk/ttdtfile.C
index 6dbb9ef887611030e642e1cffb1c543c268b984e..de5d62ad9fba9400b6bba40c48709387ad489105 100644 (file)
--- a/cde/lib/tt/lib/tttk/ttdtfile.C
+++ b/cde/lib/tt/lib/tttk/ttdtfile.C
@@ -31,9 +31,9 @@
  * Copyright 1993 Sun Microsystems, Inc.  All rights reserved.
  */
 #include <unistd.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_api.h"
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 #include "tttk/tttkpattern.h"
 #include "tttk/tttkmessage.h"
 #include "tttk/tttk2free.h"

diff --git a/cde/lib/tt/lib/tttk/ttdtprocid.h b/cde/lib/tt/lib/tttk/ttdtprocid.h
index 3fdcb96c3cc80ef612d6bf57e35b7d084e55a20c..b6312e46e5470376139586f248cb99c6ab7f9354 100644 (file)
--- a/cde/lib/tt/lib/tttk/ttdtprocid.h
+++ b/cde/lib/tt/lib/tttk/ttdtprocid.h
@@ -35,7 +35,7 @@
 #define ttdtprocid_h
 
 #include "util/tt_new.h"
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 
 class _TtDtProcid: public _Tt_allocated {
     public:

diff --git a/cde/lib/tt/lib/tttk/ttmedia.C b/cde/lib/tt/lib/tttk/ttmedia.C
index 2b5c323c9001567298d1133f885d1dab16ae4b30..74f73354b94c971536e832a59c55478390d2afaa 100644 (file)
--- a/cde/lib/tt/lib/tttk/ttmedia.C
+++ b/cde/lib/tt/lib/tttk/ttmedia.C
@@ -25,9 +25,9 @@
 //%%  (c) Copyright 1993, 1994 Sun Microsystems, Inc.                  
 //%%  (c) Copyright 1993, 1994 Novell, Inc.                            
 //%%  $XConsortium: ttmedia.C /main/3 1995/10/23 10:32:41 rswiston $                                                   
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_gettext.h"
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 #include "tttk/ttdesktop.h"
 #include "tttk/tttkmessage.h"
 #include "tttk/tttkpattern.h"

diff --git a/cde/lib/tt/lib/tttk/tttk.C b/cde/lib/tt/lib/tttk/tttk.C
index 8ce2be4118070ab55d8e10bd6dc30f77cd3cf2d9..826ec8b9ed5237e846e0d7fcc6c125b9472d99dc 100644 (file)
--- a/cde/lib/tt/lib/tttk/tttk.C
+++ b/cde/lib/tt/lib/tttk/tttk.C
@@ -33,11 +33,11 @@
 #include <errno.h>
 #include <unistd.h>
 #include <limits.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_gettext.h"
 #include "util/tt_Xlib.h"
 #include "util/tt_port.h"
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 #include "tttk/tttk2free.h"
 #include "tttk/tttkutils.h"
 #include "tttk/tttkpattern.h"

diff --git a/cde/lib/tt/lib/tttk/tttk2free.h b/cde/lib/tt/lib/tttk/tttk2free.h
index 20089b02a8cc8f2329d9e7f31213d245adbcce9a..3fcc592810923bbdcad138b0cc6c4afc4a57f637 100644 (file)
--- a/cde/lib/tt/lib/tttk/tttk2free.h
+++ b/cde/lib/tt/lib/tttk/tttk2free.h
@@ -33,9 +33,9 @@
 #ifndef tttk2free_h
 #define tttk2free_h
 
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_new.h"
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 
 //
 // An instance of this class will automatically destroy() a message or

diff --git a/cde/lib/tt/lib/tttk/tttkmessage.C b/cde/lib/tt/lib/tttk/tttkmessage.C
index 4741c20b0fd800d13cf55e5567a1895946e549de..633f04dedcf8cb179fdbcee2ae58fb64e5fd9667 100644 (file)
--- a/cde/lib/tt/lib/tttk/tttkmessage.C
+++ b/cde/lib/tt/lib/tttk/tttkmessage.C
@@ -30,9 +30,9 @@
  *
  * Copyright 1993 Sun Microsystems, Inc.  All rights reserved.
  */
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "api/c/api_mp.h"
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 #include "tttk/tttkpattern.h"
 #include "tttk/tttkmessage.h"
 #include "tttk/tttk2free.h"

diff --git a/cde/lib/tt/lib/tttk/tttkmessage.h b/cde/lib/tt/lib/tttk/tttkmessage.h
index c5bfcc39eb958456eefb6cc280324647bb29a8ef..e138ba32b6a5192d8df35a040a6310e520338f74 100644 (file)
--- a/cde/lib/tt/lib/tttk/tttkmessage.h
+++ b/cde/lib/tt/lib/tttk/tttkmessage.h
@@ -34,7 +34,7 @@
 #ifndef ttdtmessage_h
 #define ttdtmessage_h
 
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 
 typedef Tt_message     (*_TtDtMessageCB)(
                                Tt_message      msg,

diff --git a/cde/lib/tt/lib/tttk/tttkpattern.C b/cde/lib/tt/lib/tttk/tttkpattern.C
index 2a021398224ed9d29adda2fedb2ef0e02dcb1496..4b5496cf0590825df2a0d7c2a08065d11eeb5941 100644 (file)
--- a/cde/lib/tt/lib/tttk/tttkpattern.C
+++ b/cde/lib/tt/lib/tttk/tttkpattern.C
@@ -30,8 +30,8 @@
  *
  * Copyright 1993 Sun Microsystems, Inc.  All rights reserved.
  */
-#include "api/c/tt_c.h"
-#include "tttk/tttk.h"
+#include "Tt/tt_c.h"
+#include "Tt/tttk.h"
 #include "tttk/tttkmessage.h"
 #include "tttk/tttk2free.h"
 #include "tttk/tttkutils.h"

diff --git a/cde/lib/tt/lib/tttk/tttkpattern.h b/cde/lib/tt/lib/tttk/tttkpattern.h
index eb53a820f6ea5173905d38ca7049cd13ab6374e7..e81dc33fcc764bdad4268d6030e72571ba0fa26f 100644 (file)
--- a/cde/lib/tt/lib/tttk/tttkpattern.h
+++ b/cde/lib/tt/lib/tttk/tttkpattern.h
@@ -34,7 +34,7 @@
 #ifndef tttkpattern_h
 #define tttkpattern_h
 
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 #include "tttk/tttkmessage.h"
 
 Tt_status              _tttk_patterns_destroy(

diff --git a/cde/lib/tt/lib/tttk/tttkutils.C b/cde/lib/tt/lib/tttk/tttkutils.C
index 6b050a4b7cf60868c9af14acba7c8dd3ddd4fcd4..b5bdc15164e21e7d2b8989988e264bcb29023f00 100644 (file)
--- a/cde/lib/tt/lib/tttk/tttkutils.C
+++ b/cde/lib/tt/lib/tttk/tttkutils.C
@@ -33,10 +33,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_port.h"
 #include "api/c/api_api.h"
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 #include "tttk/tttkutils.h"
 
 char _TttkKeys[ _TttkNumKeys ] = { 0 };

diff --git a/cde/lib/tt/lib/util/frozen.tt_trace_parse.c b/cde/lib/tt/lib/util/frozen.tt_trace_parse.c
index d1037c3a4ed8115128d5ba8400b4abfb44585633..c751650307a084f4bcc7fcf77cbbf23ada7e1eed 100644 (file)
--- a/cde/lib/tt/lib/util/frozen.tt_trace_parse.c
+++ b/cde/lib/tt/lib/util/frozen.tt_trace_parse.c
@@ -151,7 +151,7 @@ extern struct tt_trace_svf tt_trace_svec[], *tt_trace_bgin;
 #include <stdio.h>
 #include <string.h>
 #include <sys/param.h>
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include "util/tt_trace.tab.h"
 
 #undef input

diff --git a/cde/lib/tt/lib/util/tt_audit.C b/cde/lib/tt/lib/util/tt_audit.C
index 1dd4bf364ee75458018c9d368634ef5e64e7c9d5..7903d84409a26230b0c4cbd0d6fd799a302d261f 100644 (file)
--- a/cde/lib/tt/lib/util/tt_audit.C
+++ b/cde/lib/tt/lib/util/tt_audit.C
@@ -33,7 +33,7 @@
  */
 #include <unistd.h>
 #include <fcntl.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_trace.h"
 #include "util/tt_global_env.h"
 #include "util/tt_audit.h"

diff --git a/cde/lib/tt/lib/util/tt_enumname.h b/cde/lib/tt/lib/util/tt_enumname.h
index 418abcf914f9bdbc7d53963b128ee2c2f8f68a3b..d21e17db14b7c9ec769ddd4176917deb29783746 100644 (file)
--- a/cde/lib/tt/lib/util/tt_enumname.h
+++ b/cde/lib/tt/lib/util/tt_enumname.h
@@ -35,7 +35,7 @@
  */
 #if !defined(_TT_ENUMNAME_H)
 #define _TT_ENUMNAME_H
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_entry_pt.h"
 
 typedef int _Tt_ce_status;

diff --git a/cde/lib/tt/lib/util/tt_iostream.h b/cde/lib/tt/lib/util/tt_iostream.h
index e56915bf39e7afac530a0cd4b1cd5f595429b401..60927144828d4fd1267eebc01701d2a081a9e47f 100644 (file)
--- a/cde/lib/tt/lib/util/tt_iostream.h
+++ b/cde/lib/tt/lib/util/tt_iostream.h
@@ -36,7 +36,7 @@
 
 #include <stdio.h>
 #include "util/tt_string.h"
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 
 class _Tt_message;
 class _Tt_pattern;

diff --git a/cde/lib/tt/lib/util/tt_trace.C b/cde/lib/tt/lib/util/tt_trace.C
index a92255f15f5b6b34f56c0d4598d36cfa2de5cd85..426d2ff2b88675494979246c0b9bdde04b95b8dd 100644 (file)
--- a/cde/lib/tt/lib/util/tt_trace.C
+++ b/cde/lib/tt/lib/util/tt_trace.C
@@ -32,7 +32,7 @@
  */
 #include <unistd.h>
 #include <fcntl.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_global_env.h"
 #include "util/tt_trace.h"
 #include "util/tt_port.h"

diff --git a/cde/lib/tt/lib/util/tt_trace.h b/cde/lib/tt/lib/util/tt_trace.h
index f073ada9fb4ef6c7dabf008f2e061e81548277e0..67d192f63c6f11cd665df605495c46e4c505e39d 100644 (file)
--- a/cde/lib/tt/lib/util/tt_trace.h
+++ b/cde/lib/tt/lib/util/tt_trace.h
@@ -38,7 +38,7 @@
 #ifdef _OPT_TIMERS_SUNOS
 #include <sys/time.h>
 #endif
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "mp/mp_message.h"
 #include "mp/mp_pattern.h"
 #include "util/tt_trace_stream.h"

diff --git a/cde/lib/tt/lib/util/tt_trace_parse.l b/cde/lib/tt/lib/util/tt_trace_parse.l
index 209cb2160af757355fa2b97082200efc268f6899..9ec1e77cdc6106b41e8448fbfbe049b31f8e5698 100644 (file)
--- a/cde/lib/tt/lib/util/tt_trace_parse.l
+++ b/cde/lib/tt/lib/util/tt_trace_parse.l
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/param.h>
-#include <api/c/tt_c.h>
+#include <Tt/tt_c.h>
 #include "util/tt_trace.tab.h"
 
 #undef input

diff --git a/cde/lib/tt/lib/util/tt_trace_parser.h b/cde/lib/tt/lib/util/tt_trace_parser.h
index 2be309b52f0b53042c956f7b2596a1c857c5e8e7..aa0661e85de1a0086a2ba8c0258688e5818cf118 100644 (file)
--- a/cde/lib/tt/lib/util/tt_trace_parser.h
+++ b/cde/lib/tt/lib/util/tt_trace_parser.h
@@ -34,7 +34,7 @@
 #ifndef _TT_TRACE_PARSER_H
 #define _TT_TRACE_PARSER_H
  
-#include       "api/c/tt_c.h"
+#include       "Tt/tt_c.h"
 #include       "util/tt_object.h"
 #include       "util/tt_string.h"
 #include       "util/tt_int_rec.h"

diff --git a/cde/lib/tt/lib/util/tt_tracefile_parse.C b/cde/lib/tt/lib/util/tt_tracefile_parse.C
index f338635075986bb861ee05565ae191188b63b68a..8d66ce3454230c803942c3ba4fd3e2206443641c 100644 (file)
--- a/cde/lib/tt/lib/util/tt_tracefile_parse.C
+++ b/cde/lib/tt/lib/util/tt_tracefile_parse.C
@@ -33,7 +33,7 @@
  */
 
 #include <ctype.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "util/tt_string.h"
 #include "util/tt_port.h"
 #include "util/tt_gettext.h"

diff --git a/cde/lib/tt/slib/Makefile.am b/cde/lib/tt/slib/Makefile.am
index 8d8c40a65bfbae90159a592e28575b8cf13ecae7..6c95a072fae40dfd9b8dce6cb7586590432d8397 100644 (file)
--- a/cde/lib/tt/slib/Makefile.am
+++ b/cde/lib/tt/slib/Makefile.am
@@ -4,12 +4,6 @@ include ../tooltalk.inc
 
 noinst_LIBRARIES = libstt.a
 
-BUILT_SOURCES = Tt
-CLEANFILES = Tt
-Tt: Makefile
-       $(RM) Tt
-       $(LN_S) ../lib/api/c Tt
-
 libstt_a_CXXFLAGS = $(TIRPCINC) $(TIRPC_DEFINES) -I../lib
 
 libstt_a_SOURCES = mp_ce_attrs.C mp_observer.C mp_observer_utils.C  \

diff --git a/cde/lib/tt/slib/mp_s_xdr_functions.h b/cde/lib/tt/slib/mp_s_xdr_functions.h
index 274fb7f2be1d5bf3a69f31abbc7c81d202ad1ef6..9bb3e2e7d3b9cc0123e5e179f515dfed3fd05be0 100644 (file)
--- a/cde/lib/tt/slib/mp_s_xdr_functions.h
+++ b/cde/lib/tt/slib/mp_s_xdr_functions.h
@@ -37,7 +37,7 @@
 #ifndef MP_S_XDR_FUNCTIONS_H
 #define MP_S_XDR_FUNCTIONS_H
 #include <rpc/rpc.h>
-#include "api/c/tt_c.h"
+#include "Tt/tt_c.h"
 #include "mp_s_message_utils.h"
 #include "mp_s_pattern_utils.h"
 #include "mp_s_procid_utils.h"

diff --git a/cde/lib/tt/slib/mp_typedb.C b/cde/lib/tt/slib/mp_typedb.C
index 4bd4f52486efd3b97b80cbc84c1609e2f637a6c7..f997cc71a94d086124768a15b723b5a574cdf883 100644 (file)
--- a/cde/lib/tt/slib/mp_typedb.C
+++ b/cde/lib/tt/slib/mp_typedb.C
@@ -52,7 +52,7 @@
 #include "mp_ptype.h"
 #include "mp_typedb.h"
 #include "api/c/api_api.h"
-#include "tttk/tttk.h"
+#include "Tt/tttk.h"
 #include <sys/stat.h>
 #include <errno.h>
 #include <sys/wait.h>