ChangeLogTag: Fri Dec 15 16:32:35 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 44 insertions, 76 deletions

diff --git a/TAO/tests/Oneway_Buffering/Makefile.am b/TAO/tests/Oneway_Buffering/Makefile.am
index c40eb6eb5af..e30d7818444 100644
--- a/TAO/tests/Oneway_Buffering/Makefile.am
+++ b/TAO/tests/Oneway_Buffering/Makefile.am
@@ -17,15 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
 
-## Makefile.Oneway_Buffering_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
+## Makefile.Oneway_Buffering_Idl.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
   TestC.inl \
@@ -33,7 +28,7 @@ BUILT_SOURCES += \
   TestS.h \
   TestS.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Test-stamp \
   TestC.cpp \
   TestC.h \
@@ -45,9 +40,18 @@ 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) $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Test.idl
+
+## Makefile.Oneway_Buffering_Server.am
+
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -61,11 +65,7 @@ server_SOURCES = \
   TestC.cpp \
   TestS.cpp \
   server.cpp \
-  Oneway_Buffering.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  Oneway_Buffering.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -85,27 +85,6 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -117,10 +96,8 @@ client_CPPFLAGS = \
 client_SOURCES = \
   TestC.cpp \
   client.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  Oneway_Buffering.h \
+  Oneway_Buffering_Admin.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -140,29 +117,6 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-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) $(srcdir)/Test.idl
-	@touch $@
-
 noinst_PROGRAMS += admin
 
 admin_CPPFLAGS = \
@@ -176,11 +130,7 @@ admin_SOURCES = \
   TestC.cpp \
   TestS.cpp \
   admin.cpp \
-  Oneway_Buffering_Admin.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  Oneway_Buffering_Admin.h
 
 admin_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index ee95112f143..b2577e7317c 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -1,35 +1,53 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): messaging, taoexe, portableserver {
+  after += *idl
   Source_Files {
     Oneway_Buffering.cpp
     server.cpp
   }  
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-// These next two projects depend on *Server (the above project)
-// due to the possibility of parallelism for the GNUACE type.  If
-// -j 2 or more is used to build this project, multiple instances
-// of tao_idl are invoked for Test.idl.  They begin to overwrite the
-// generated source files and cause problems for the processes that
-// have gone on to build the generated files. By depending on *Server,
-// only one process is allowed to compile Test.idl and thus the build
-// succeeds.
 project(*Client): messaging, taoexe, portableserver {
   requires += corba_messaging
+  after += *idl
   after += *Server
 
   Source_Files {
-    TestC.cpp
     client.cpp
   }  
+  Source_Files {
+    TestC.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Admin): messaging, taoexe, portableserver {
+  after += *idl
   after += *Client
   Source_Files {
     Oneway_Buffering_Admin.cpp
     admin.cpp
   }  
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+  }
+  IDL_Files {
+  }
 }