ChangeLogTag: Wed Dec 6 15:29:25 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 29 insertions, 40 deletions

diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc
index 19054caa68f..039d2f757fa 100644
--- a/TAO/tests/BiDirectional/BiDirectional.mpc
+++ b/TAO/tests/BiDirectional/BiDirectional.mpc
@@ -1,19 +1,35 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1;
+}
+
 project(*Server): taoserver, anytypecode, avoids_minimum_corba, bidir_giop {
+  after += *idl
   Source_Files {
     test_i.cpp
     server.cpp
+    testC.cpp
+    testS.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client): taoserver, anytypecode, avoids_minimum_corba, bidir_giop {
   exename = client
+  after += *idl
   after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
+    testC.cpp
+    testS.cpp
+  }
+  IDL_Files {
   }
 }
-
diff --git a/TAO/tests/BiDirectional/Makefile.am b/TAO/tests/BiDirectional/Makefile.am
index 31fa81d1bd6..c05d0ba36f2 100644
--- a/TAO/tests/BiDirectional/Makefile.am
+++ b/TAO/tests/BiDirectional/Makefile.am
@@ -17,14 +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.BiDirectional_Server.am
-
-if BUILD_EXCEPTIONS
+## Makefile.BiDirectional_Idl.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   testC.cpp \
   testC.h \
   testC.inl \
@@ -32,7 +28,7 @@ BUILT_SOURCES += \
   testS.h \
   testS.inl
 
-CLEANFILES += \
+CLEANFILES = \
   test-stamp \
   testC.cpp \
   testC.h \
@@ -44,9 +40,17 @@ 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.BiDirectional_Server.am
+
+if BUILD_EXCEPTIONS
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -60,10 +64,6 @@ server_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
   test_i.h \
   test_i.inl
 
@@ -82,29 +82,6 @@ endif BUILD_EXCEPTIONS
 
 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 += client
 
 client_CPPFLAGS = \
@@ -118,10 +95,6 @@ client_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
   test_i.h \
   test_i.inl