Mon Jul 9 15:40:40 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>

6 files changed, 82 insertions, 80 deletions

diff --git a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am b/TAO/tests/Smart_Proxies/Benchmark/Makefile.am
index 22d34bb9a70..c261752e1e8 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am
+++ b/TAO/tests/Smart_Proxies/Benchmark/Makefile.am
@@ -50,53 +50,53 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.SP_Benchmark_Server.am
+## Makefile.SP_Benchmark_Client.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += server
+noinst_PROGRAMS += client
 
-server_CPPFLAGS = \
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_SOURCES = \
-  server.cpp \
+client_SOURCES = \
+  Smart_Proxy_Impl.cpp \
+  client.cpp \
   testC.cpp \
-  testS.cpp \
   Smart_Proxy_Impl.h
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.SP_Benchmark_Client.am
+## Makefile.SP_Benchmark_Server.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
+server_SOURCES = \
+  server.cpp \
   testC.cpp \
+  testS.cpp \
   Smart_Proxy_Impl.h
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Makefile.am b/TAO/tests/Smart_Proxies/Collocation/Makefile.am
index 18920bf27cb..ce924eb3e3b 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Makefile.am
+++ b/TAO/tests/Smart_Proxies/Collocation/Makefile.am
@@ -116,6 +116,8 @@ main_LDADD = \
   libColl_Test_Stubs.la \
   libDiamond.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
diff --git a/TAO/tests/Smart_Proxies/Makefile.am b/TAO/tests/Smart_Proxies/Makefile.am
index 1a5794d6175..fc138d32d2e 100644
--- a/TAO/tests/Smart_Proxies/Makefile.am
+++ b/TAO/tests/Smart_Proxies/Makefile.am
@@ -58,53 +58,53 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.Smart_Proxies_Server.am
+## Makefile.Smart_Proxies_Client.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += server
+noinst_PROGRAMS += client
 
-server_CPPFLAGS = \
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_SOURCES = \
-  server.cpp \
+client_SOURCES = \
+  Smart_Proxy_Impl.cpp \
+  client.cpp \
   testC.cpp \
-  testS.cpp \
   Smart_Proxy_Impl.h
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.Smart_Proxies_Client.am
+## Makefile.Smart_Proxies_Server.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
+server_SOURCES = \
+  server.cpp \
   testC.cpp \
+  testS.cpp \
   Smart_Proxy_Impl.h
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am b/TAO/tests/Smart_Proxies/On_Demand/Makefile.am
index 5f0141abcd9..e22553b6155 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am
+++ b/TAO/tests/Smart_Proxies/On_Demand/Makefile.am
@@ -50,56 +50,56 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.SP_On_Demand_Server.am
+## Makefile.SP_On_Demand_Client.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += server
+noinst_PROGRAMS += client
 
-server_CPPFLAGS = \
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_SOURCES = \
-  server.cpp \
+client_SOURCES = \
+  Smart_Proxy_Impl.cpp \
+  Smart_Test_Factory.cpp \
+  client.cpp \
   testC.cpp \
-  testS.cpp \
   Smart_Proxy_Impl.h \
   Smart_Test_Factory.h
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.SP_On_Demand_Client.am
+## Makefile.SP_On_Demand_Server.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  Smart_Test_Factory.cpp \
-  client.cpp \
+server_SOURCES = \
+  server.cpp \
   testC.cpp \
+  testS.cpp \
   Smart_Proxy_Impl.h \
   Smart_Test_Factory.h
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/tests/Smart_Proxies/Policy/Makefile.am b/TAO/tests/Smart_Proxies/Policy/Makefile.am
index 0890285a505..ce5d86a73e2 100644
--- a/TAO/tests/Smart_Proxies/Policy/Makefile.am
+++ b/TAO/tests/Smart_Proxies/Policy/Makefile.am
@@ -50,53 +50,53 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.SP_Policy_Server.am
+## Makefile.SP_Policy_Client.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += server
+noinst_PROGRAMS += client
 
-server_CPPFLAGS = \
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_SOURCES = \
-  server.cpp \
+client_SOURCES = \
+  Smart_Proxy_Impl.cpp \
+  client.cpp \
   testC.cpp \
-  testS.cpp \
   Smart_Proxy_Impl.h
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.SP_Policy_Client.am
+## Makefile.SP_Policy_Server.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
+server_SOURCES = \
+  server.cpp \
   testC.cpp \
+  testS.cpp \
   Smart_Proxy_Impl.h
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/tests/Smart_Proxies/dtor/Makefile.am b/TAO/tests/Smart_Proxies/dtor/Makefile.am
index 8db55984659..9419e17fcce 100644
--- a/TAO/tests/Smart_Proxies/dtor/Makefile.am
+++ b/TAO/tests/Smart_Proxies/dtor/Makefile.am
@@ -50,53 +50,53 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.Dtor_Server.am
+## Makefile.Dtor_Client.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += server
+noinst_PROGRAMS += client
 
-server_CPPFLAGS = \
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_SOURCES = \
-  server.cpp \
+client_SOURCES = \
+  Smart_Proxy_Impl.cpp \
+  client.cpp \
   testC.cpp \
-  testS.cpp \
   Smart_Proxy_Impl.h
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.Dtor_Client.am
+## Makefile.Dtor_Server.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_SOURCES = \
-  Smart_Proxy_Impl.cpp \
-  client.cpp \
+server_SOURCES = \
+  server.cpp \
   testC.cpp \
+  testS.cpp \
   Smart_Proxy_Impl.h
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la