ChangeLogTag: Thu Dec 22 16:07:11 2005 J.T. Conklin <jtc@acorntoolworks.com>

5 files changed, 171 insertions, 168 deletions

diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am
index fd5b9526d45..1c051f39f86 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am
@@ -16,12 +16,13 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.CSD_Test_ThreadPool_Client.am
+## Makefile.CSD_Test_ThreadPool_Server.am
 
 BUILT_SOURCES = \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
@@ -33,49 +34,59 @@ CLEANFILES = \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS = client_main
+noinst_PROGRAMS = server_main
 
-client_main_CPPFLAGS = \
+server_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_main_SOURCES = \
-  ClientApp.cpp \
+server_main_SOURCES = \
   FooC.cpp \
-  client_main.cpp \
-  ClientApp.h \
+  FooS.cpp \
+  Foo_i.cpp \
+  OrbShutdownTask.cpp \
+  ServerApp.cpp \
+  server_main.cpp \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl
+  FooS_T.inl \
+  Foo_i.h \
+  OrbShutdownTask.h \
+  ServerApp.h
 
-client_main_LDADD = \
+server_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.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.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.CSD_Test_ThreadPool_Server.am
+## Makefile.CSD_Test_ThreadPool_Client.am
 
 BUILT_SOURCES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
@@ -87,49 +98,38 @@ CLEANFILES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS += server_main
+noinst_PROGRAMS += client_main
 
-server_main_CPPFLAGS = \
+client_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_main_SOURCES = \
+client_main_SOURCES = \
+  ClientApp.cpp \
   FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
+  client_main.cpp \
+  ClientApp.h \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
+  FooS_T.inl
 
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
index 4b5bb5684d4..b389ead8c05 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
@@ -16,12 +16,13 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.CSD_Test_ThreadPool2_Client.am
+## Makefile.CSD_Test_ThreadPool2_Server.am
 
 BUILT_SOURCES = \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
@@ -33,49 +34,61 @@ CLEANFILES = \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS = client_main
+noinst_PROGRAMS = server_main
 
-client_main_CPPFLAGS = \
+server_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_main_SOURCES = \
-  ClientApp.cpp \
+server_main_SOURCES = \
   FooC.cpp \
-  client_main.cpp \
-  ClientApp.h \
+  FooS.cpp \
+  FooServantList.cpp \
+  Foo_i.cpp \
+  OrbShutdownTask.cpp \
+  ServerApp.cpp \
+  server_main.cpp \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl
+  FooS_T.inl \
+  FooServantList.h \
+  Foo_i.h \
+  OrbShutdownTask.h \
+  ServerApp.h
 
-client_main_LDADD = \
+server_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.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.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.CSD_Test_ThreadPool2_Server.am
+## Makefile.CSD_Test_ThreadPool2_Client.am
 
 BUILT_SOURCES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
@@ -87,51 +100,38 @@ CLEANFILES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS += server_main
+noinst_PROGRAMS += client_main
 
-server_main_CPPFLAGS = \
+client_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_main_SOURCES = \
+client_main_SOURCES = \
+  ClientApp.cpp \
   FooC.cpp \
-  FooS.cpp \
-  FooServantList.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
+  client_main.cpp \
+  ClientApp.h \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl \
-  FooServantList.h \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
+  FooS_T.inl
 
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am
index 7983255579c..d4dd209e8dd 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am
@@ -16,12 +16,13 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.CSD_Test_ThreadPool3_Client.am
+## Makefile.CSD_Test_ThreadPool3_Server.am
 
 BUILT_SOURCES = \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
@@ -33,49 +34,61 @@ CLEANFILES = \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS = client_main
+noinst_PROGRAMS = server_main
 
-client_main_CPPFLAGS = \
+server_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_main_SOURCES = \
-  ClientApp.cpp \
+server_main_SOURCES = \
   FooC.cpp \
-  client_main.cpp \
-  ClientApp.h \
+  FooS.cpp \
+  Foo_i.cpp \
+  OrbShutdownTask.cpp \
+  OrbTask.cpp \
+  ServerApp.cpp \
+  server_main.cpp \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl
+  FooS_T.inl \
+  Foo_i.h \
+  OrbShutdownTask.h \
+  OrbTask.h \
+  ServerApp.h
 
-client_main_LDADD = \
+server_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.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.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.CSD_Test_ThreadPool3_Server.am
+## Makefile.CSD_Test_ThreadPool3_Client.am
 
 BUILT_SOURCES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
@@ -87,51 +100,38 @@ CLEANFILES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS += server_main
+noinst_PROGRAMS += client_main
 
-server_main_CPPFLAGS = \
+client_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_main_SOURCES = \
+client_main_SOURCES = \
+  ClientApp.cpp \
   FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
+  client_main.cpp \
+  ClientApp.h \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServerApp.h
+  FooS_T.inl
 
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am
index a0fe280ec12..cd7f41e97b3 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.CSD_Test_ThreadPool5_Client.am
+## Makefile.CSD_Test_ThreadPool5_Server.am
 
 BUILT_SOURCES = \
   CallbackC.cpp \
@@ -51,6 +51,7 @@ BUILT_SOURCES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
@@ -62,49 +63,59 @@ CLEANFILES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS = client_main
+noinst_PROGRAMS = server_main
 
-client_main_CPPFLAGS = \
+server_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_main_SOURCES = \
+server_main_SOURCES = \
   CallbackC.cpp \
   CallbackS.cpp \
   Callback_i.cpp \
-  ClientApp.cpp \
   ClientTask.cpp \
   FooC.cpp \
-  client_main.cpp \
+  FooS.cpp \
+  FooServantList.cpp \
+  Foo_i.cpp \
+  OrbShutdownTask.cpp \
+  OrbTask.cpp \
+  ServerApp.cpp \
+  server_main.cpp \
   CallbackC.h \
   CallbackC.inl \
   CallbackS.h \
   CallbackS_T.h \
   CallbackS_T.inl \
   Callback_i.h \
-  ClientApp.h \
   ClientTask.h \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl
+  FooS_T.inl \
+  FooServantList.h \
+  Foo_i.h \
+  OrbShutdownTask.h \
+  OrbTask.h \
+  ServerApp.h
 
-client_main_LDADD = \
+server_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
   $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
@@ -114,7 +125,7 @@ client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.CSD_Test_ThreadPool5_Server.am
+## Makefile.CSD_Test_ThreadPool5_Client.am
 
 BUILT_SOURCES += \
   CallbackC.cpp \
@@ -149,7 +160,6 @@ BUILT_SOURCES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
@@ -161,59 +171,49 @@ CLEANFILES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS += server_main
+noinst_PROGRAMS += client_main
 
-server_main_CPPFLAGS = \
+client_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_main_SOURCES = \
+client_main_SOURCES = \
   CallbackC.cpp \
   CallbackS.cpp \
   Callback_i.cpp \
+  ClientApp.cpp \
   ClientTask.cpp \
   FooC.cpp \
-  FooS.cpp \
-  FooServantList.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
+  client_main.cpp \
   CallbackC.h \
   CallbackC.inl \
   CallbackS.h \
   CallbackS_T.h \
   CallbackS_T.inl \
   Callback_i.h \
+  ClientApp.h \
   ClientTask.h \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl \
-  FooServantList.h \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServerApp.h
+  FooS_T.inl
 
-server_main_LDADD = \
+client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
   $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
index 5f2785ef3b7..8f254b0093c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
@@ -16,69 +16,85 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
+CLEANFILES =
+noinst_PROGRAMS =
+BUILT_SOURCES =
 
-## Makefile.CSD_Test_ThreadPool6_Client.am
+## Makefile.CSD_Test_ThreadPool6_Server.am
 
-BUILT_SOURCES = \
+if !BUILD_MINIMUM_CORBA
+
+BUILT_SOURCES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   Foo-stamp \
   FooC.cpp \
   FooC.h \
   FooC.inl \
+  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS = client_main
+noinst_PROGRAMS += server_main
 
-client_main_CPPFLAGS = \
+server_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_main_SOURCES = \
-  ClientApp.cpp \
+server_main_SOURCES = \
   FooC.cpp \
-  client_main.cpp \
-  ClientApp.h \
+  FooS.cpp \
+  Foo_i.cpp \
+  OrbShutdownTask.cpp \
+  ServerApp.cpp \
+  server_main.cpp \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl
+  FooS_T.inl \
+  Foo_i.h \
+  OrbShutdownTask.h \
+  ServerApp.h
 
-client_main_LDADD = \
+server_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.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.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.CSD_Test_ThreadPool6_Server.am
+endif !BUILD_MINIMUM_CORBA
 
-if !BUILD_MINIMUM_CORBA
+## Makefile.CSD_Test_ThreadPool6_Client.am
 
 BUILT_SOURCES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
@@ -90,55 +106,42 @@ CLEANFILES += \
   FooC.cpp \
   FooC.h \
   FooC.inl \
-  FooS.cpp \
   FooS.h \
   FooS.inl \
   FooS_T.cpp \
   FooS_T.h \
   FooS_T.inl
 
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
+FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
 	@touch $@
 
-noinst_PROGRAMS += server_main
+noinst_PROGRAMS += client_main
 
-server_main_CPPFLAGS = \
+client_main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_main_SOURCES = \
+client_main_SOURCES = \
+  ClientApp.cpp \
   FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
+  client_main.cpp \
+  ClientApp.h \
   FooC.h \
   FooC.inl \
   FooS.h \
   FooS_T.h \
-  FooS_T.inl \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
+  FooS_T.inl
 
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_MINIMUM_CORBA
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*