From 31fec7edb5039f698ef1b54de929705e547f3add Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 25 Oct 2019 17:37:58 -0600 Subject: [PATCH] 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 , 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. --- cde/lib/tt/bin/shell/copier.C | 2 +- cde/lib/tt/bin/shell/copier.h | 2 +- cde/lib/tt/bin/shell/mover.C | 2 +- cde/lib/tt/bin/shell/mover.h | 2 +- cde/lib/tt/bin/shell/rcopier.C | 2 +- cde/lib/tt/bin/shell/rcopier.h | 2 +- cde/lib/tt/bin/shell/remover.C | 2 +- cde/lib/tt/bin/shell/remover.h | 2 +- cde/lib/tt/bin/ttauth/process.c | 2 +- cde/lib/tt/bin/ttauth/ttauth.c | 2 +- cde/lib/tt/bin/ttdbserverd/db_server_functions.C | 2 +- cde/lib/tt/bin/tttar/archiver.C | 2 +- cde/lib/tt/bin/tttar/archiver.h | 2 +- cde/lib/tt/bin/tttar/tttar_api.C | 2 +- cde/lib/tt/bin/tttar/tttar_spec.C | 2 +- cde/lib/tt/bin/tttar/tttar_utils.C | 2 +- cde/lib/tt/bin/tttar/tttar_utils.h | 2 +- cde/lib/tt/bin/tttrace/tttrace.C | 2 +- cde/lib/tt/lib/api/c/Makefile.am | 2 -- cde/lib/tt/lib/api/c/api_api.C | 2 +- cde/lib/tt/lib/api/c/api_api.h | 2 +- cde/lib/tt/lib/api/c/api_auth.C | 2 +- cde/lib/tt/lib/api/c/api_default.C | 2 +- cde/lib/tt/lib/api/c/api_error.h | 2 +- cde/lib/tt/lib/api/c/api_file.C | 2 +- cde/lib/tt/lib/api/c/api_filemap.C | 2 +- cde/lib/tt/lib/api/c/api_filemap.h | 2 +- cde/lib/tt/lib/api/c/api_message.C | 2 +- cde/lib/tt/lib/api/c/api_mp.C | 2 +- cde/lib/tt/lib/api/c/api_mp.h | 2 +- cde/lib/tt/lib/api/c/api_mp_otype.C | 2 +- cde/lib/tt/lib/api/c/api_pattern.C | 2 +- cde/lib/tt/lib/api/c/api_session_prop.C | 2 +- cde/lib/tt/lib/api/c/api_spec.C | 2 +- cde/lib/tt/lib/api/c/api_typecb.h | 2 +- cde/lib/tt/lib/api/dnd/ttdnd.c | 2 +- cde/lib/tt/lib/db/old_db_server_functions.C | 2 +- cde/lib/tt/lib/db/tt_old_db.C | 2 +- cde/lib/tt/lib/dm/dm_enums.h | 2 +- cde/lib/tt/lib/mp/mp_context.h | 2 +- cde/lib/tt/lib/mp/mp_global.h | 2 +- cde/lib/tt/lib/mp/mp_xdr_functions.h | 2 +- cde/lib/tt/lib/tttk/Makefile.am | 14 -------------- cde/lib/tt/lib/tttk/ttdesktop.C | 4 ++-- cde/lib/tt/lib/tttk/ttdesktop.h | 2 +- cde/lib/tt/lib/tttk/ttdtfile.C | 4 ++-- cde/lib/tt/lib/tttk/ttdtprocid.h | 2 +- cde/lib/tt/lib/tttk/ttmedia.C | 4 ++-- cde/lib/tt/lib/tttk/tttk.C | 4 ++-- cde/lib/tt/lib/tttk/tttk2free.h | 4 ++-- cde/lib/tt/lib/tttk/tttkmessage.C | 4 ++-- cde/lib/tt/lib/tttk/tttkmessage.h | 2 +- cde/lib/tt/lib/tttk/tttkpattern.C | 4 ++-- cde/lib/tt/lib/tttk/tttkpattern.h | 2 +- cde/lib/tt/lib/tttk/tttkutils.C | 4 ++-- cde/lib/tt/lib/util/frozen.tt_trace_parse.c | 2 +- cde/lib/tt/lib/util/tt_audit.C | 2 +- cde/lib/tt/lib/util/tt_enumname.h | 2 +- cde/lib/tt/lib/util/tt_iostream.h | 2 +- cde/lib/tt/lib/util/tt_trace.C | 2 +- cde/lib/tt/lib/util/tt_trace.h | 2 +- cde/lib/tt/lib/util/tt_trace_parse.l | 2 +- cde/lib/tt/lib/util/tt_trace_parser.h | 2 +- cde/lib/tt/lib/util/tt_tracefile_parse.C | 2 +- cde/lib/tt/slib/Makefile.am | 6 ------ cde/lib/tt/slib/mp_s_xdr_functions.h | 2 +- cde/lib/tt/slib/mp_typedb.C | 2 +- 67 files changed, 72 insertions(+), 94 deletions(-) diff --git a/cde/lib/tt/bin/shell/copier.C b/cde/lib/tt/bin/shell/copier.C index 176184b1b..f48aedca4 100644 --- a/cde/lib/tt/bin/shell/copier.C +++ b/cde/lib/tt/bin/shell/copier.C @@ -41,7 +41,7 @@ #include #include #include -#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 e645b9ad4..b66935762 100644 --- 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 +#include #include class copier : public _Tt_object { diff --git a/cde/lib/tt/bin/shell/mover.C b/cde/lib/tt/bin/shell/mover.C index 94c72ea13..7a70a0973 100644 --- a/cde/lib/tt/bin/shell/mover.C +++ b/cde/lib/tt/bin/shell/mover.C @@ -46,7 +46,7 @@ #include #include #include -#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 780cb2002..3a38ddbf0 100644 --- 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 +#include #include class mover : public _Tt_object { diff --git a/cde/lib/tt/bin/shell/rcopier.C b/cde/lib/tt/bin/shell/rcopier.C index 91b1b5db3..ff74b9f1c 100644 --- 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 #endif -#include +#include #include #include #include diff --git a/cde/lib/tt/bin/shell/rcopier.h b/cde/lib/tt/bin/shell/rcopier.h index 69a6b85a9..6dc385d51 100644 --- 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 +#include #include class rpath : public _Tt_object { diff --git a/cde/lib/tt/bin/shell/remover.C b/cde/lib/tt/bin/shell/remover.C index bb0c92146..d677c9b2a 100644 --- a/cde/lib/tt/bin/shell/remover.C +++ b/cde/lib/tt/bin/shell/remover.C @@ -46,7 +46,7 @@ #include #include #include -#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 d5f6a7632..0b8b6ba8c 100644 --- 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 +#include #include class remover : public _Tt_object { diff --git a/cde/lib/tt/bin/ttauth/process.c b/cde/lib/tt/bin/ttauth/process.c index cffe65c25..99a5b15ce 100644 --- 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 diff --git a/cde/lib/tt/bin/ttauth/ttauth.c b/cde/lib/tt/bin/ttauth/ttauth.c index 2453cc9f7..10e0e95b5 100644 --- 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 d71b4f55f..10f3270ad 100644 --- 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 #include -#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 9c3aa8e51..ae9795180 100644 --- a/cde/lib/tt/bin/tttar/archiver.C +++ b/cde/lib/tt/bin/tttar/archiver.C @@ -42,7 +42,7 @@ #include #include #include -#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 d5879631e..2919d9158 100644 --- 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 +#include #include #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 f24af18a8..e742c3a83 100644 --- a/cde/lib/tt/bin/tttar/tttar_api.C +++ b/cde/lib/tt/bin/tttar/tttar_api.C @@ -40,7 +40,7 @@ #endif #include #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 cf3574619..bee2cb13d 100644 --- a/cde/lib/tt/bin/tttar/tttar_spec.C +++ b/cde/lib/tt/bin/tttar/tttar_spec.C @@ -37,7 +37,7 @@ #else #include #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 a0d4aaa4d..bb27b6357 100644 --- a/cde/lib/tt/bin/tttar/tttar_utils.C +++ b/cde/lib/tt/bin/tttar/tttar_utils.C @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #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 bd917a2c8..a0c6327f7 100644 --- 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 +#include #include diff --git a/cde/lib/tt/bin/tttrace/tttrace.C b/cde/lib/tt/bin/tttrace/tttrace.C index 346bfc93f..8012996ad 100644 --- a/cde/lib/tt/bin/tttrace/tttrace.C +++ b/cde/lib/tt/bin/tttrace/tttrace.C @@ -46,7 +46,7 @@ #include #include #include -#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 a249ceb11..67b1a470a 100644 --- 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 3f83958f8..0d2074a52 100644 --- 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 #include #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 5878113de..297c6d79b 100644 --- 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 1bd4f8fa5..4c9a1a92f 100644 --- 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 aff922af9..a3a4d741d 100644 --- 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 diff --git a/cde/lib/tt/lib/api/c/api_error.h b/cde/lib/tt/lib/api/c/api_error.h index 454a5e258..c5609add5 100644 --- 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 cd42acca2..153eb15fe 100644 --- 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 7efdb03b2..2728db500 100644 --- 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 3ca3b5494..9537642fb 100644 --- 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 99e7e0dc6..104608ae8 100644 --- 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 05f1719d1..87cacc515 100644 --- 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 b5d6085eb..c368bc67b 100644 --- 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 +#include #include 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 7f7f25817..dc3637eff 100644 --- 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 dc0e73e34..8c85adc0f 100644 --- 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 44fce568b..c2c564ea5 100644 --- 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 333303235..bade071d1 100644 --- 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 #include #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 293cb5c9c..8f7581537 100644 --- 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 18a4b9972..ef635d77e 100644 --- a/cde/lib/tt/lib/api/dnd/ttdnd.c +++ b/cde/lib/tt/lib/api/dnd/ttdnd.c @@ -34,7 +34,7 @@ #include #include #include -#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 c42b0a2e7..50f288a1f 100644 --- 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 c2fb31917..1d1a6c781 100644 --- 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 #include -#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 e282257ca..5f51321c2 100644 --- 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 #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 ccdc340dd..f100cee66 100644 --- a/cde/lib/tt/lib/mp/mp_context.h +++ b/cde/lib/tt/lib/mp/mp_context.h @@ -42,7 +42,7 @@ #include #include -#include +#include #include 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 e4799d4a0..143df1ff1 100644 --- 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 de084f845..6ecc64004 100644 --- 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 #include -#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 15085884a..8540371ac 100644 --- 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 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 68794db70..a352cfe74 100644 --- a/cde/lib/tt/lib/tttk/ttdesktop.C +++ b/cde/lib/tt/lib/tttk/ttdesktop.C @@ -49,11 +49,11 @@ #include #include #include -#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 7d4f70838..581d9177e 100644 --- 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 6dbb9ef88..de5d62ad9 100644 --- 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 -#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 3fdcb96c3..b6312e46e 100644 --- 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 2b5c323c9..74f73354b 100644 --- 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 8ce2be411..826ec8b9e 100644 --- a/cde/lib/tt/lib/tttk/tttk.C +++ b/cde/lib/tt/lib/tttk/tttk.C @@ -33,11 +33,11 @@ #include #include #include -#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 20089b02a..3fcc59281 100644 --- 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 4741c20b0..633f04ded 100644 --- 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 c5bfcc39e..e138ba32b 100644 --- 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 2a0213982..4b5496cf0 100644 --- 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 eb53a820f..e81dc33fc 100644 --- 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 6b050a4b7..b5bdc1516 100644 --- a/cde/lib/tt/lib/tttk/tttkutils.C +++ b/cde/lib/tt/lib/tttk/tttkutils.C @@ -33,10 +33,10 @@ #include #include #include -#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 d1037c3a4..c75165030 100644 --- 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 #include #include -#include +#include #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 1dd4bf364..7903d8440 100644 --- a/cde/lib/tt/lib/util/tt_audit.C +++ b/cde/lib/tt/lib/util/tt_audit.C @@ -33,7 +33,7 @@ */ #include #include -#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 418abcf91..d21e17db1 100644 --- 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 e56915bf3..609271448 100644 --- a/cde/lib/tt/lib/util/tt_iostream.h +++ b/cde/lib/tt/lib/util/tt_iostream.h @@ -36,7 +36,7 @@ #include #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 a92255f15..426d2ff2b 100644 --- a/cde/lib/tt/lib/util/tt_trace.C +++ b/cde/lib/tt/lib/util/tt_trace.C @@ -32,7 +32,7 @@ */ #include #include -#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 f073ada9f..67d192f63 100644 --- 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 #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 209cb2160..9ec1e77cd 100644 --- 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 #include #include -#include +#include #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 2be309b52..aa0661e85 100644 --- 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 f33863507..8d66ce345 100644 --- 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 -#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 8d8c40a65..6c95a072f 100644 --- 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 274fb7f2b..9bb3e2e7d 100644 --- 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 -#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 4bd4f5248..f997cc71a 100644 --- 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 #include #include