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.
2025-02-15 04:32:24 +00:00 · 2019-10-25 17:37:58 -06:00 · 2019-10-25 17:37:58 -06:00 · 31fec7edb5
commit 31fec7edb5
parent 369308b737
67 changed files with 72 additions and 94 deletions
--- 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"
--- 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 {
--- 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"
--- 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 {
--- 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>
--- 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 {
--- 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"
--- 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 {
--- 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>

--- 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"


 /*
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"

--- 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>


--- 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"
--- 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
--- 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"
--- 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];

--- 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 *
--- 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>
--- 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
--- 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"
--- 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"
--- 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  {
--- 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"
--- 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"
--- 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>


--- 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"
--- 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"
--- 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"
--- 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"
--- 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__)
--- 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();
--- 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&);
--- 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"
--- 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;
--- 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 {
--- 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
--- 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"
--- 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 \
--- 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"
--- 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 {
--- 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"
--- 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:
--- 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"
--- 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"
--- 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
--- 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"
--- 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,
--- 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"
--- 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(
--- 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 };
--- 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
--- 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"
--- 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;
--- 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;
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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  \
--- 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"
--- 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>