From 45a88bef801c7cf492bcd2086b1fd0ed292f6ceb Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Fri, 12 Nov 2004 22:28:16 +0000 Subject: ChangeLogTag:Fri Nov 12 17:23:41 2004 Steve Huston --- netsvcs/Makefile.am | 2 +- netsvcs/clients/Logger/Makefile.am | 21 ++++++++++++--------- netsvcs/clients/Makefile.am | 2 +- netsvcs/clients/Naming/Client/Makefile.am | 24 ++++++++++++------------ netsvcs/clients/Naming/Dump_Restore/Makefile.am | 24 ++++++++++++------------ netsvcs/clients/Naming/Makefile.am | 2 +- netsvcs/lib/Makefile.am | 22 ++++++++++++---------- netsvcs/servers/Makefile.am | 13 +++++++------ 8 files changed, 58 insertions(+), 52 deletions(-) (limited to 'netsvcs') diff --git a/netsvcs/Makefile.am b/netsvcs/Makefile.am index f3d559265e8..422221e4029 100644 --- a/netsvcs/Makefile.am +++ b/netsvcs/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ lib \ diff --git a/netsvcs/clients/Logger/Makefile.am b/netsvcs/clients/Logger/Makefile.am index 42046a96bfe..72637468a3a 100644 --- a/netsvcs/clients/Logger/Makefile.am +++ b/netsvcs/clients/Logger/Makefile.am @@ -6,15 +6,17 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu + +ACE_BUILDDIR = $(top_builddir) +ACE_ROOT = $(top_srcdir) ## Makefile.direct_logging.am noinst_PROGRAMS = direct_logging direct_logging_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir) + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) direct_logging_SOURCES = \ direct_logging.cpp @@ -26,9 +28,8 @@ direct_logging_LDADD = \ noinst_PROGRAMS += indirect_logging indirect_logging_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir) + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) indirect_logging_SOURCES = \ indirect_logging.cpp @@ -38,6 +39,8 @@ indirect_logging_LDADD = \ ## Clean up template repositories, etc. clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/netsvcs/clients/Makefile.am b/netsvcs/clients/Makefile.am index 595f146924e..c959505ff73 100644 --- a/netsvcs/clients/Makefile.am +++ b/netsvcs/clients/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Logger \ diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am index d20010067e3..342611b669e 100644 --- a/netsvcs/clients/Naming/Client/Makefile.am +++ b/netsvcs/clients/Naming/Client/Makefile.am @@ -6,23 +6,22 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu + +ACE_BUILDDIR = $(top_builddir) +ACE_ROOT = $(top_srcdir) ## Makefile.Netsvsc_Client_Test_Lib.am noinst_LTLIBRARIES = libClient_Test.la libClient_Test_la_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir) \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ -DACE_CLIENT_TEST_BUILD_DLL libClient_Test_la_SOURCES = \ Client_Test.cpp -libClient_Test_la_LDFLAGS = \ - -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ - libClient_Test_la_LIBADD = \ $(top_builddir)/ace/libACE.la @@ -33,9 +32,8 @@ noinst_HEADERS = \ noinst_PROGRAMS = main main_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir) + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) main_SOURCES = \ main.cpp \ @@ -46,6 +44,8 @@ main_LDADD = \ ## Clean up template repositories, etc. clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am index 764811029ce..51e678fdac5 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile.am +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.am @@ -6,23 +6,22 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu + +ACE_BUILDDIR = $(top_builddir) +ACE_ROOT = $(top_srcdir) ## Makefile.Netsvcs_Dump_Restore_Lib.am noinst_LTLIBRARIES = libDump_Restore.la libDump_Restore_la_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir) \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ -DACE_BUILD_SVC_DLL libDump_Restore_la_SOURCES = \ Dump_Restore.cpp -libDump_Restore_la_LDFLAGS = \ - -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ - libDump_Restore_la_LIBADD = \ $(top_builddir)/ace/libACE.la @@ -33,9 +32,8 @@ noinst_HEADERS = \ noinst_PROGRAMS = main main_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir) + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) main_SOURCES = \ main.cpp \ @@ -46,6 +44,8 @@ main_LDADD = \ ## Clean up template repositories, etc. clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/netsvcs/clients/Naming/Makefile.am b/netsvcs/clients/Naming/Makefile.am index ce115bb2cc7..883b9bab54d 100644 --- a/netsvcs/clients/Naming/Makefile.am +++ b/netsvcs/clients/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Client \ diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am index 04282e3d800..de9e99c7110 100644 --- a/netsvcs/lib/Makefile.am +++ b/netsvcs/lib/Makefile.am @@ -6,15 +6,17 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu + +ACE_BUILDDIR = $(top_builddir) +ACE_ROOT = $(top_srcdir) ## Makefile.netsvcs.am -lib_LTLIBRARIES = libnetsvcs.la +noinst_LTLIBRARIES = libnetsvcs.la libnetsvcs_la_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir) \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ -DACE_NETSVCS_BUILD_DLL libnetsvcs_la_SOURCES = \ @@ -23,13 +25,11 @@ libnetsvcs_la_SOURCES = \ Log_Message_Receiver.cpp \ Name_Handler.cpp \ Server_Logging_Handler.cpp \ + Server_Logging_Handler_T.cpp \ TS_Clerk_Handler.cpp \ TS_Server_Handler.cpp \ Token_Handler.cpp -libnetsvcs_la_LDFLAGS = \ - -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ - libnetsvcs_la_LIBADD = \ $(top_builddir)/ace/libACE.la @@ -47,6 +47,8 @@ noinst_HEADERS = \ ## Clean up template repositories, etc. clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am index f2654748ea4..c24b4f8a81c 100644 --- a/netsvcs/servers/Makefile.am +++ b/netsvcs/servers/Makefile.am @@ -6,10 +6,10 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu -ACE_ROOT = $(top_srcdir) ACE_BUILDDIR = $(top_builddir) +ACE_ROOT = $(top_srcdir) ## Makefile.Netsvcs_server.am noinst_PROGRAMS = main @@ -23,11 +23,12 @@ main_SOURCES = \ main.cpp main_LDADD = \ - $(ACE_BUILDDIR)/netsvcs/lib/libnetsvcs.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/netsvcs/lib/libnetsvcs.la $(top_builddir)/ace/libACE.la ## Clean up template repositories, etc. clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB -- cgit v1.2.1