From 3d5e0931c6a5693d8c5655f7222fac000bcb94bd Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Mon, 27 Sep 2004 21:14:29 +0000 Subject: ChangeLogTag:Mon Sep 27 17:04:29 2004 Steve Huston --- netsvcs/clients/Logger/Makefile.am | 6 ++---- netsvcs/clients/Naming/Client/Makefile.am | 6 ++---- netsvcs/clients/Naming/Dump_Restore/Makefile.am | 8 +++----- netsvcs/lib/Makefile.am | 4 +--- netsvcs/servers/Makefile.am | 5 ++--- 5 files changed, 10 insertions(+), 19 deletions(-) (limited to 'netsvcs') diff --git a/netsvcs/clients/Logger/Makefile.am b/netsvcs/clients/Logger/Makefile.am index 962adef1494..42046a96bfe 100644 --- a/netsvcs/clients/Logger/Makefile.am +++ b/netsvcs/clients/Logger/Makefile.am @@ -8,15 +8,13 @@ ## 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 -ACE_BUILDDIR = $(top_builddir) - ## Makefile.direct_logging.am noinst_PROGRAMS = direct_logging direct_logging_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) + -I$(top_srcdir) direct_logging_SOURCES = \ direct_logging.cpp @@ -30,7 +28,7 @@ noinst_PROGRAMS += indirect_logging indirect_logging_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) + -I$(top_srcdir) indirect_logging_SOURCES = \ indirect_logging.cpp diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am index c1e6cfc66ac..464655703f6 100644 --- a/netsvcs/clients/Naming/Client/Makefile.am +++ b/netsvcs/clients/Naming/Client/Makefile.am @@ -8,15 +8,13 @@ ## 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 -ACE_BUILDDIR = $(top_builddir) - ## Makefile.Netsvsc_Client_Test_Lib.am noinst_LTLIBRARIES = libClient_Test.la libClient_Test_la_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) \ + -I$(top_srcdir) \ -DACE_CLIENT_TEST_BUILD_DLL libClient_Test_la_SOURCES = \ @@ -34,7 +32,7 @@ noinst_PROGRAMS = main main_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) + -I$(top_srcdir) main_SOURCES = \ main.cpp \ diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am index cc5dfd0c1c7..8de26714922 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile.am +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.am @@ -8,15 +8,13 @@ ## 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 -ACE_BUILDDIR = $(top_builddir) - ## Makefile.Netsvcs_Dump_Restore_Lib.am noinst_LTLIBRARIES = libDump_Restore.la libDump_Restore_la_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) \ + -I$(top_srcdir) \ -DACE_BUILD_SVC_DLL libDump_Restore_la_SOURCES = \ @@ -34,14 +32,14 @@ noinst_PROGRAMS = main main_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) + -I$(top_srcdir) main_SOURCES = \ main.cpp \ Dump_Restore.h main_LDADD = \ - libDump_Restore.la $(top_builddir)/ace/libACE.la + libDump_Restore.la $(top_builddir)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am index 7fd980d3c3b..7d17a9833af 100644 --- a/netsvcs/lib/Makefile.am +++ b/netsvcs/lib/Makefile.am @@ -8,15 +8,13 @@ ## 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 -ACE_BUILDDIR = $(top_builddir) - ## Makefile.netsvcs.am noinst_LTLIBRARIES = libnetsvcs.la libnetsvcs_la_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) \ + -I$(top_srcdir) \ -DACE_NETSVCS_BUILD_DLL libnetsvcs_la_SOURCES = \ diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am index b1dbc676a98..84f542883c2 100644 --- a/netsvcs/servers/Makefile.am +++ b/netsvcs/servers/Makefile.am @@ -9,7 +9,6 @@ ## /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 ACE_ROOT = $(top_srcdir) -ACE_BUILDDIR = $(top_builddir) ## Makefile.Netsvcs_server.am noinst_PROGRAMS = main @@ -17,14 +16,14 @@ noinst_PROGRAMS = main main_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(ACE_BUILDDIR) \ + -I$(top_srcdir) \ -I$(ACE_ROOT)/netsvcs/lib main_SOURCES = \ main.cpp main_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la $(top_builddir)/ace/libACE.la + $(top_builddir)/lib/libnetsvcs.la $(top_builddir)/lib/libACE.la ## Clean up template repositories, etc. clean-local: -- cgit v1.2.1