ChangeLogTag: Wed Dec 6 13:40:52 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

13 files changed, 248 insertions, 184 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a972a8aa3f4..a6ba3bba89f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Wed Dec  6 13:40:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* examples/CSD_Strategy/ThreadPool6/Makefile.am:
+	* examples/Simple/time-date/Makefile.am:
+	* orbsvcs/examples/ORT/Makefile.am:
+	* orbsvcs/tests/Bug_2709_Regression/Makefile.am:
+	* tests/Bug_2654_Regression/Makefile.am:
+	* tests/OctetSeq/Makefile.am:
+	* tests/Oneway_Timeouts/Makefile.am:
+	* tests/Param_Test/Makefile.am:
+	* tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
+
+          Regenerate.
+
+        * configure.ac:
+	* orbsvcs/tests/Makefile.am:
+        * tests/Makefile.am:
+
+          Changes for move of Bug_2709_Regression unit test.
+
 Wed Dec  6 08:30:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * *.mpc:
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 5bf5ff1ecf0..14f2be8f1cf 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -459,6 +459,7 @@ if test $tao_build_tests = yes; then
     orbsvcs/tests/Bug_2316_Regression/Makefile
     orbsvcs/tests/Bug_2377_Regression/Makefile
     orbsvcs/tests/Bug_2615_Regression/Makefile
+    orbsvcs/tests/Bug_2709_Regression/Makefile
     orbsvcs/tests/Concurrency/Makefile
     orbsvcs/tests/CosEvent/Basic/Makefile
     orbsvcs/tests/CosEvent/Makefile
@@ -635,7 +636,6 @@ if test $tao_build_tests = yes; then
     tests/Bug_2654_Regression/Makefile
     tests/Bug_2669_Regression/Makefile
     tests/Bug_2683_Regression/Makefile
-    tests/Bug_2709_Regression/Makefile
     tests/CDR/Makefile
     tests/COIOP/Makefile
     tests/CSD_Strategy_Tests/Broken/Makefile
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
index 69a14a6dc63..e541a36038f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
@@ -51,6 +51,31 @@ Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 noinst_HEADERS = \
   Foo.idl
 
+## Makefile.CSD_Test_ThreadPool6_Client.am
+
+if BUILD_EXCEPTIONS
+
+noinst_PROGRAMS += client_main
+
+client_main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+client_main_SOURCES = \
+  ClientApp.cpp \
+  FooC.cpp \
+  client_main.cpp \
+  ClientApp.h
+
+client_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
 ## Makefile.CSD_Test_ThreadPool6_Server.am
 
 if BUILD_EXCEPTIONS
@@ -88,31 +113,6 @@ server_main_LDADD = \
 endif BUILD_THREADS
 endif BUILD_EXCEPTIONS
 
-## Makefile.CSD_Test_ThreadPool6_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am
index 91e07f8e758..c058ccfdb60 100644
--- a/TAO/examples/Simple/time-date/Makefile.am
+++ b/TAO/examples/Simple/time-date/Makefile.am
@@ -63,6 +63,7 @@ libTime_Date_la_SOURCES = \
 
 noinst_HEADERS = \
   Alt_Resource_Factory.h \
+  Time_Date.h \
   Time_Date.idl \
   Time_DateC.h \
   Time_DateC.inl \
diff --git a/TAO/orbsvcs/examples/ORT/Makefile.am b/TAO/orbsvcs/examples/ORT/Makefile.am
index c13121abb73..7bede3b326d 100644
--- a/TAO/orbsvcs/examples/ORT/Makefile.am
+++ b/TAO/orbsvcs/examples/ORT/Makefile.am
@@ -95,6 +95,39 @@ noinst_HEADERS = \
   ObjectReferenceFactory.idl \
   sum_server.idl
 
+## Makefile.ORT_Client.am
+
+if BUILD_EXCEPTIONS
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+client_SOURCES = \
+  client.cpp \
+  sum_serverC.cpp \
+  Gateway_ObjRef_Factory.h \
+  Gateway_i.h \
+  Object_Factory_i.h \
+  Server_IORInterceptor.h \
+  Server_IORInterceptor_ORBInitializer.h \
+  sum_server_i.h
+
+client_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
 ## Makefile.ORT_Gateway.am
 
 if BUILD_CORBA_MESSAGING
@@ -177,39 +210,6 @@ server_LDADD = \
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
-## Makefile.ORT_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL
-
-client_SOURCES = \
-  client.cpp \
-  sum_serverC.cpp \
-  Gateway_ObjRef_Factory.h \
-  Gateway_i.h \
-  Object_Factory_i.h \
-  Server_IORInterceptor.h \
-  Server_IORInterceptor_ORBInitializer.h \
-  sum_server_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2709_Regression/Makefile.am
index 879f0dd283b..bcd37454d54 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Makefile.am
@@ -20,6 +20,12 @@ noinst_PROGRAMS =
 
 ## Makefile.Bug_2709_Regression_Idl.am
 
+if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
+
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -40,13 +46,19 @@ CLEANFILES = \
 TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
 
 Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
 	@touch $@
 
 
 noinst_HEADERS = \
   Test.idl
 
+endif !BUILD_ACE_FOR_TAO
+endif BUILD_INTERCEPTORS
+endif BUILD_EXCEPTIONS
+endif BUILD_CORBA_MESSAGING
+endif BUILD_ACE_UUID
+
 ## Makefile.Bug_2709_Regression_Client.am
 
 if BUILD_ACE_UUID
@@ -63,7 +75,8 @@ client_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
 
 client_SOURCES = \
   Client_Task.cpp \
@@ -77,6 +90,11 @@ client_SOURCES = \
   TestImpl.h
 
 client_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
@@ -100,7 +118,11 @@ endif BUILD_ACE_UUID
 
 ## Makefile.Bug_2709_Regression_Server.am
 
+if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
+if BUILD_INTERCEPTORS
+if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -108,7 +130,10 @@ server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
 
 server_SOURCES = \
   Server_Task.cpp \
@@ -120,13 +145,31 @@ server_SOURCES = \
   TestImpl.h
 
 server_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.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_ACE_FOR_TAO
+endif BUILD_INTERCEPTORS
 endif BUILD_EXCEPTIONS
+endif BUILD_CORBA_MESSAGING
+endif BUILD_ACE_UUID
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
index 190f83a7841..60a47feaba8 100644
--- a/TAO/orbsvcs/tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS = \
         Bug_2316_Regression \
         Bug_2377_Regression \
         Bug_2615_Regression \
+        Bug_2709_Regression \
         Concurrency \
         CosEvent \
         EC_Custom_Marshal \
diff --git a/TAO/tests/Bug_2654_Regression/Makefile.am b/TAO/tests/Bug_2654_Regression/Makefile.am
index 3a0a9209cb8..4bb6f3f63ce 100644
--- a/TAO/tests/Bug_2654_Regression/Makefile.am
+++ b/TAO/tests/Bug_2654_Regression/Makefile.am
@@ -47,68 +47,68 @@ Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
 noinst_HEADERS = \
   Hello.idl
 
-## Makefile.Bug_2654_Regression_Server.am
+## Makefile.Bug_2654_Regression_Client.am
 
+if BUILD_CORBA_MESSAGING
 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 = \
-  Hello.cpp \
+client_SOURCES = \
   HelloC.cpp \
   HelloS.cpp \
-  server.cpp \
+  client.cpp \
   Hello.h
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_EXCEPTIONS
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.Bug_2654_Regression_Client.am
+## Makefile.Bug_2654_Regression_Server.am
 
-if BUILD_CORBA_MESSAGING
 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 = \
+server_SOURCES = \
+  Hello.cpp \
   HelloC.cpp \
   HelloS.cpp \
-  client.cpp \
+  server.cpp \
   Hello.h
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/TAO/tests/Makefile.am b/TAO/tests/Makefile.am
index f8b9b9349bb..bfdf95c3913 100644
--- a/TAO/tests/Makefile.am
+++ b/TAO/tests/Makefile.am
@@ -86,7 +86,6 @@ SUBDIRS = \
         Bug_2654_Regression \
         Bug_2669_Regression \
         Bug_2683_Regression \
-        Bug_2709_Regression \
         CDR \
         COIOP \
         Cache_Growth_Test \
diff --git a/TAO/tests/OctetSeq/Makefile.am b/TAO/tests/OctetSeq/Makefile.am
index 9fda7f1b047..8d23c55718e 100644
--- a/TAO/tests/OctetSeq/Makefile.am
+++ b/TAO/tests/OctetSeq/Makefile.am
@@ -47,29 +47,26 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 noinst_HEADERS = \
   test.idl
 
-## Makefile.OctetSeq_Server.am
+## Makefile.OctetSeq_Client.am
 
 if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
-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 = \
+  client.cpp \
   testC.cpp \
-  testS.cpp \
-  test_i.cpp \
   test_i.h \
   test_i.inl
 
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -77,56 +74,59 @@ server_LDADD = \
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 
-## Makefile.OctetSeq_Client.am
+## Makefile.OctetSeq_OctetSeq.am
 
 if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
 
-noinst_PROGRAMS += client
+noinst_PROGRAMS += OctetSeq
 
-client_CPPFLAGS = \
+OctetSeq_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_SOURCES = \
-  client.cpp \
+OctetSeq_SOURCES = \
+  OctetSeq.cpp \
   testC.cpp \
   test_i.h \
   test_i.inl
 
-client_LDADD = \
+OctetSeq_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 
-## Makefile.OctetSeq_OctetSeq.am
+## Makefile.OctetSeq_Server.am
 
 if BUILD_EXCEPTIONS
+if !BUILD_ACE_FOR_TAO
 
-noinst_PROGRAMS += OctetSeq
+noinst_PROGRAMS += server
 
-OctetSeq_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-OctetSeq_SOURCES = \
-  OctetSeq.cpp \
+server_SOURCES = \
+  server.cpp \
   testC.cpp \
+  testS.cpp \
+  test_i.cpp \
   test_i.h \
   test_i.inl
 
-OctetSeq_LDADD = \
+server_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.
diff --git a/TAO/tests/Oneway_Timeouts/Makefile.am b/TAO/tests/Oneway_Timeouts/Makefile.am
index f6cd2b10fac..58b973482ba 100644
--- a/TAO/tests/Oneway_Timeouts/Makefile.am
+++ b/TAO/tests/Oneway_Timeouts/Makefile.am
@@ -68,8 +68,8 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/Param_Test/Makefile.am b/TAO/tests/Param_Test/Makefile.am
index 29555f35c9b..24b6f0f7c20 100644
--- a/TAO/tests/Param_Test/Makefile.am
+++ b/TAO/tests/Param_Test/Makefile.am
@@ -47,26 +47,66 @@ param_test-stamp: $(srcdir)/param_test.idl $(TAO_IDL_DEP)
 noinst_HEADERS = \
   param_test.idl
 
-## Makefile.Param_Test_Server.am
+## Makefile.Param_Test_Anyop.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += server
+noinst_PROGRAMS += anyop
 
-server_CPPFLAGS = \
+anyop_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_SOURCES = \
+anyop_SOURCES = \
+  anyop.cpp \
   param_testC.cpp \
-  param_testS.cpp \
-  param_test_i.cpp \
-  server.cpp \
-  param_test_i.h
+  any.h \
+  bd_array_seq.h \
+  bd_long_seq.h \
+  bd_short_seq.h \
+  bd_str_seq.h \
+  bd_string.h \
+  bd_struct_seq.h \
+  bd_wstr_seq.h \
+  bd_wstring.h \
+  big_union.h \
+  client.h \
+  complex_any.h \
+  driver.h \
+  except.h \
+  fixed_array.h \
+  fixed_struct.h \
+  helper.h \
+  multdim_array.h \
+  nested_struct.h \
+  objref.h \
+  objref_struct.h \
+  options.h \
+  param_test_i.h \
+  recursive_struct.h \
+  recursive_union.h \
+  results.h \
+  short.h \
+  small_union.h \
+  tests.h \
+  typecode.h \
+  ub_any_seq.h \
+  ub_array_seq.h \
+  ub_long_seq.h \
+  ub_objref_seq.h \
+  ub_short_seq.h \
+  ub_str_seq.h \
+  ub_string.h \
+  ub_struct_seq.h \
+  ub_wstr_seq.h \
+  ub_wstring.h \
+  ulonglong.h \
+  var_array.h \
+  var_struct.h
 
-server_LDADD = \
+anyop_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
@@ -188,66 +228,26 @@ endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
-## Makefile.Param_Test_Anyop.am
+## Makefile.Param_Test_Server.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += anyop
+noinst_PROGRAMS += server
 
-anyop_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-anyop_SOURCES = \
-  anyop.cpp \
+server_SOURCES = \
   param_testC.cpp \
-  any.h \
-  bd_array_seq.h \
-  bd_long_seq.h \
-  bd_short_seq.h \
-  bd_str_seq.h \
-  bd_string.h \
-  bd_struct_seq.h \
-  bd_wstr_seq.h \
-  bd_wstring.h \
-  big_union.h \
-  client.h \
-  complex_any.h \
-  driver.h \
-  except.h \
-  fixed_array.h \
-  fixed_struct.h \
-  helper.h \
-  multdim_array.h \
-  nested_struct.h \
-  objref.h \
-  objref_struct.h \
-  options.h \
-  param_test_i.h \
-  recursive_struct.h \
-  recursive_union.h \
-  results.h \
-  short.h \
-  small_union.h \
-  tests.h \
-  typecode.h \
-  ub_any_seq.h \
-  ub_array_seq.h \
-  ub_long_seq.h \
-  ub_objref_seq.h \
-  ub_short_seq.h \
-  ub_str_seq.h \
-  ub_string.h \
-  ub_struct_seq.h \
-  ub_wstr_seq.h \
-  ub_wstring.h \
-  ulonglong.h \
-  var_array.h \
-  var_struct.h
+  param_testS.cpp \
+  param_test_i.cpp \
+  server.cpp \
+  param_test_i.h
 
-anyop_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am
index ff23c5510c2..b3901677c95 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am
@@ -47,66 +47,66 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 noinst_HEADERS = \
   test.idl
 
-## Makefile.PI_ORB_Shutdown_Server.am
+## Makefile.PI_ORB_Shutdown_Client.am
 
 if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
 
-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_ORBInitializer.cpp \
-  Server_Request_Interceptor.cpp \
-  server.cpp \
+client_SOURCES = \
+  client.cpp \
   testC.cpp \
-  testS.cpp \
-  test_i.cpp \
   Server_ORBInitializer.h \
   Server_Request_Interceptor.h \
   test_i.h
 
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif BUILD_INTERCEPTORS
 endif BUILD_EXCEPTIONS
 
-## Makefile.PI_ORB_Shutdown_Client.am
+## Makefile.PI_ORB_Shutdown_Server.am
 
 if BUILD_EXCEPTIONS
+if BUILD_INTERCEPTORS
 
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_SOURCES = \
-  client.cpp \
+server_SOURCES = \
+  Server_ORBInitializer.cpp \
+  Server_Request_Interceptor.cpp \
+  server.cpp \
   testC.cpp \
+  testS.cpp \
+  test_i.cpp \
   Server_ORBInitializer.h \
   Server_Request_Interceptor.h \
   test_i.h
 
-client_LDADD = \
+server_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.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
 
+endif BUILD_INTERCEPTORS
 endif BUILD_EXCEPTIONS
 
 ## Clean up template repositories, etc.