ChangeLogTag: Tue Dec 12 17:34:25 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 77 insertions, 144 deletions

diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index 6978ceefb50..8c2ae1263cc 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -1,71 +1,88 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*idl): taoidldefaults {
   IDL_Files {
     test.idl
+    ping.idl
   }
+  custom_only = 1
+}
+
+project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *idl
 
   Source_Files {
-    testC.cpp
-    testS.cpp
     test_i.cpp
     server.cpp
   }
+  Source_Files {
+    testC.cpp
+    testS.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Middle): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *idl
   after += *Server
-  IDL_Files {
-    test.idl
-  }
 
   Source_Files {
-    testC.cpp
-    testS.cpp
     test_i.cpp
     middle.cpp
   }
+  Source_Files {
+    testC.cpp
+    testS.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Client): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *idl
   after += *Middle
-  IDL_Files {
-    test.idl
-  }
 
   Source_Files {
-    testC.cpp
-    testS.cpp
     test_i.cpp
     client.cpp
   }
+  Source_Files {
+    testC.cpp
+    testS.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Ping): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  IDL_Files {
-    ping.idl
-  }
+  after += *idl
 
   Source_Files {
-    pingC.cpp
-    pingS.cpp
     ping_i.cpp
     ping.cpp
   }
+  Source_Files {
+    pingC.cpp
+    pingS.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Pong): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *idl
   after += *Ping
-  IDL_Files {
-    ping.idl
-  }
 
   Source_Files {
-    pingC.cpp
-    pingS.cpp
     ping_i.cpp
     pong.cpp
   }
+  Source_Files {
+    pingC.cpp
+    pingS.cpp
+  }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/tests/Faults/Makefile.am b/TAO/tests/Faults/Makefile.am
index e69eb2af040..0af16538933 100644
--- a/TAO/tests/Faults/Makefile.am
+++ b/TAO/tests/Faults/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.Faults_Server.am
-
-if BUILD_EXCEPTIONS
+## Makefile.Faults_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,41 @@ 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 $@
+
+BUILT_SOURCES += \
+  pingC.cpp \
+  pingC.h \
+  pingC.inl \
+  pingS.cpp \
+  pingS.h \
+  pingS.inl
+
+CLEANFILES += \
+  ping-stamp \
+  pingC.cpp \
+  pingC.h \
+  pingC.inl \
+  pingS.cpp \
+  pingS.h \
+  pingS.inl
+
+pingC.cpp pingC.h pingC.inl pingS.cpp pingS.h pingS.inl: ping-stamp
+
+ping-stamp: $(srcdir)/ping.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ping.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  ping.idl \
+  test.idl
+
+## Makefile.Faults_Server.am
+
+if BUILD_EXCEPTIONS
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -60,10 +88,6 @@ server_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
   test_i.h \
   test_i.inl
 
@@ -79,29 +103,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 += middle
 
 middle_CPPFLAGS = \
@@ -115,10 +116,6 @@ middle_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
   test_i.h \
   test_i.inl
 
@@ -134,29 +131,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 = \
@@ -170,10 +144,6 @@ client_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl \
   test_i.h \
   test_i.inl
 
@@ -189,29 +159,6 @@ endif BUILD_EXCEPTIONS
 
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  pingC.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.cpp \
-  pingS.h \
-  pingS.inl
-
-CLEANFILES += \
-  ping-stamp \
-  pingC.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.cpp \
-  pingS.h \
-  pingS.inl
-
-pingC.cpp pingC.h pingC.inl pingS.cpp pingS.h pingS.inl: ping-stamp
-
-ping-stamp: $(srcdir)/ping.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/ping.idl
-	@touch $@
-
 noinst_PROGRAMS += ping
 
 ping_CPPFLAGS = \
@@ -225,10 +172,6 @@ ping_SOURCES = \
   pingC.cpp \
   pingS.cpp \
   ping_i.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.h \
-  pingS.inl \
   ping_i.h \
   ping_i.inl
 
@@ -244,29 +187,6 @@ endif BUILD_EXCEPTIONS
 
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  pingC.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.cpp \
-  pingS.h \
-  pingS.inl
-
-CLEANFILES += \
-  ping-stamp \
-  pingC.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.cpp \
-  pingS.h \
-  pingS.inl
-
-pingC.cpp pingC.h pingC.inl pingS.cpp pingS.h pingS.inl: ping-stamp
-
-ping-stamp: $(srcdir)/ping.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/ping.idl
-	@touch $@
-
 noinst_PROGRAMS += pong
 
 pong_CPPFLAGS = \
@@ -280,10 +200,6 @@ pong_SOURCES = \
   pingS.cpp \
   ping_i.cpp \
   pong.cpp \
-  pingC.h \
-  pingC.inl \
-  pingS.h \
-  pingS.inl \
   ping_i.h \
   ping_i.inl