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

7 files changed, 125 insertions, 125 deletions

diff --git a/TAO/tests/OBV/Any/Makefile.am b/TAO/tests/OBV/Any/Makefile.am
index ba5caa6ec5a..4553f57aa99 100644
--- a/TAO/tests/OBV/Any/Makefile.am
+++ b/TAO/tests/OBV/Any/Makefile.am
@@ -50,53 +50,53 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_Any_Server.am
+## Makefile.OBV_Any_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 = \
+client_SOURCES = \
   AnyC.cpp \
-  AnyS.cpp \
-  AnyS_impl.cpp \
-  server.cpp \
+  client.cpp \
   AnyS_impl.h
 
-server_LDADD = \
+client_LDADD = \
   $(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
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_Any_Client.am
+## Makefile.OBV_Any_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 = \
+server_SOURCES = \
   AnyC.cpp \
-  client.cpp \
+  AnyS.cpp \
+  AnyS_impl.cpp \
+  server.cpp \
   AnyS_impl.h
 
-client_LDADD = \
+server_LDADD = \
   $(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/OBV/Collocated/Forward/Makefile.am b/TAO/tests/OBV/Collocated/Forward/Makefile.am
index 3342f2616ea..4dbe912c3ea 100644
--- a/TAO/tests/OBV/Collocated/Forward/Makefile.am
+++ b/TAO/tests/OBV/Collocated/Forward/Makefile.am
@@ -24,6 +24,29 @@ BUILT_SOURCES =
 if BUILD_EXCEPTIONS
 
 BUILT_SOURCES += \
+  TreeNodeC.cpp \
+  TreeNodeC.h \
+  TreeNodeC.inl \
+  TreeNodeS.cpp \
+  TreeNodeS.h \
+  TreeNodeS.inl
+
+CLEANFILES += \
+  TreeNode-stamp \
+  TreeNodeC.cpp \
+  TreeNodeC.h \
+  TreeNodeC.inl \
+  TreeNodeS.cpp \
+  TreeNodeS.h \
+  TreeNodeS.inl
+
+TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp
+
+TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl
+	@touch $@
+
+BUILT_SOURCES += \
   TreeBaseC.cpp \
   TreeBaseC.h \
   TreeBaseC.inl \
@@ -69,29 +92,6 @@ TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl
 	@touch $@
 
-BUILT_SOURCES += \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-CLEANFILES += \
-  TreeNode-stamp \
-  TreeNodeC.cpp \
-  TreeNodeC.h \
-  TreeNodeC.inl \
-  TreeNodeS.cpp \
-  TreeNodeS.h \
-  TreeNodeS.inl
-
-TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp
-
-TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl
-	@touch $@
-
 noinst_PROGRAMS = collocated
 
 collocated_CPPFLAGS = \
diff --git a/TAO/tests/OBV/Factory/Makefile.am b/TAO/tests/OBV/Factory/Makefile.am
index 463ec0a7659..0cadc346136 100644
--- a/TAO/tests/OBV/Factory/Makefile.am
+++ b/TAO/tests/OBV/Factory/Makefile.am
@@ -50,56 +50,56 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_Factory_Server.am
+## Makefile.OBV_Factory_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 = \
+client_SOURCES = \
   FactoryC.cpp \
   FactoryC_impl.cpp \
-  FactoryS.cpp \
-  FactoryS_impl.cpp \
-  server.cpp \
-  FactoryC_impl.h \
-  FactoryS_impl.h
+  client.cpp \
+  FactoryC_impl.h
 
-server_LDADD = \
+client_LDADD = \
   $(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
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_Factory_Client.am
+## Makefile.OBV_Factory_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 = \
+server_SOURCES = \
   FactoryC.cpp \
   FactoryC_impl.cpp \
-  client.cpp \
-  FactoryC_impl.h
+  FactoryS.cpp \
+  FactoryS_impl.cpp \
+  server.cpp \
+  FactoryC_impl.h \
+  FactoryS_impl.h
 
-client_LDADD = \
+server_LDADD = \
   $(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/OBV/Forward/Makefile.am b/TAO/tests/OBV/Forward/Makefile.am
index f76f3d922b3..2d1c345ac29 100644
--- a/TAO/tests/OBV/Forward/Makefile.am
+++ b/TAO/tests/OBV/Forward/Makefile.am
@@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -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)
 
-noinst_PROGRAMS =
 CLEANFILES =
+noinst_PROGRAMS =
 BUILT_SOURCES =
 
 ## Makefile.OBV_Forward_Idl.am
@@ -100,59 +100,59 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_Forward_Server.am
+## Makefile.OBV_Forward_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 = \
-  Test_impl.cpp \
+client_SOURCES = \
   TreeBaseC.cpp \
-  TreeBaseS.cpp \
   TreeControllerC.cpp \
-  TreeControllerS.cpp \
   TreeNodeC.cpp \
-  TreeNodeS.cpp \
-  server.cpp \
+  client.cpp \
   Test_impl.h
 
-server_LDADD = \
+client_LDADD = \
   $(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
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_Forward_Client.am
+## Makefile.OBV_Forward_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 = \
+server_SOURCES = \
+  Test_impl.cpp \
   TreeBaseC.cpp \
+  TreeBaseS.cpp \
   TreeControllerC.cpp \
+  TreeControllerS.cpp \
   TreeNodeC.cpp \
-  client.cpp \
+  TreeNodeS.cpp \
+  server.cpp \
   Test_impl.h
 
-client_LDADD = \
+server_LDADD = \
   $(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/OBV/TC_Alignment/Makefile.am b/TAO/tests/OBV/TC_Alignment/Makefile.am
index 1b21e048ad5..a44c97f7356 100644
--- a/TAO/tests/OBV/TC_Alignment/Makefile.am
+++ b/TAO/tests/OBV/TC_Alignment/Makefile.am
@@ -50,53 +50,53 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_TC_Alignment_Server.am
+## Makefile.OBV_TC_Alignment_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 = \
+  client.cpp \
   testC.cpp \
-  testS.cpp \
-  test_i.cpp \
   test_i.h
 
-server_LDADD = \
+client_LDADD = \
   $(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
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_TC_Alignment_Client.am
+## Makefile.OBV_TC_Alignment_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 = \
-  client.cpp \
+server_SOURCES = \
+  server.cpp \
   testC.cpp \
+  testS.cpp \
+  test_i.cpp \
   test_i.h
 
-client_LDADD = \
+server_LDADD = \
   $(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/OBV/Truncatable/Makefile.am b/TAO/tests/OBV/Truncatable/Makefile.am
index 97cbaf84abd..5976e7c8e0f 100644
--- a/TAO/tests/OBV/Truncatable/Makefile.am
+++ b/TAO/tests/OBV/Truncatable/Makefile.am
@@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -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)
 
-noinst_PROGRAMS =
 CLEANFILES =
+noinst_PROGRAMS =
 BUILT_SOURCES =
 
 ## Makefile.OBV_Truncatable_Idl.am
@@ -76,56 +76,56 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_Truncatable_Server.am
+## Makefile.OBV_Truncatable_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 = \
+client_SOURCES = \
   ExtraC.cpp \
-  ExtraS.cpp \
   TruncatableC.cpp \
-  TruncatableS.cpp \
-  TruncatableS_impl.cpp \
-  server.cpp \
+  client.cpp \
   TruncatableS_impl.h
 
-server_LDADD = \
+client_LDADD = \
   $(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
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.OBV_Truncatable_Client.am
+## Makefile.OBV_Truncatable_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 = \
+server_SOURCES = \
   ExtraC.cpp \
+  ExtraS.cpp \
   TruncatableC.cpp \
-  client.cpp \
+  TruncatableS.cpp \
+  TruncatableS_impl.cpp \
+  server.cpp \
   TruncatableS_impl.h
 
-client_LDADD = \
+server_LDADD = \
   $(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/OBV/ValueBox/Makefile.am b/TAO/tests/OBV/ValueBox/Makefile.am
index 4f382b3ec31..17a61f1758b 100644
--- a/TAO/tests/OBV/ValueBox/Makefile.am
+++ b/TAO/tests/OBV/ValueBox/Makefile.am
@@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -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)
 
-noinst_PROGRAMS =
 CLEANFILES =
+noinst_PROGRAMS =
 BUILT_SOURCES =
 
 ## Makefile.valuebox_idl.am
@@ -124,62 +124,62 @@ noinst_HEADERS = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.Valuebox_Server.am
+## Makefile.Valuebox_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 = \
-  Test_impl.cpp \
-  server.cpp \
+client_SOURCES = \
+  client.cpp \
   valueboxC.cpp \
-  valueboxS.cpp \
   vb_basicC.cpp \
-  vb_basicS.cpp \
   vb_structC.cpp \
-  vb_structS.cpp \
   vb_unionC.cpp \
-  vb_unionS.cpp \
   Test_impl.h
 
-server_LDADD = \
+client_LDADD = \
   $(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
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.Valuebox_Client.am
+## Makefile.Valuebox_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 = \
-  client.cpp \
+server_SOURCES = \
+  Test_impl.cpp \
+  server.cpp \
   valueboxC.cpp \
+  valueboxS.cpp \
   vb_basicC.cpp \
+  vb_basicS.cpp \
   vb_structC.cpp \
+  vb_structS.cpp \
   vb_unionC.cpp \
+  vb_unionS.cpp \
   Test_impl.h
 
-client_LDADD = \
+server_LDADD = \
   $(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