ChangeLogTag: Sat Dec 9 23:18:53 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 32 insertions, 43 deletions

diff --git a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
index bf8946a0384..e2d0b8a08cc 100644
--- a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
+++ b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
@@ -1,21 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  idlflags += -Gp -Gd -Sa -St
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoserver, iortable {
   exename = server
-  idlflags += -Gp -Gd -Sa -St
+  after += *idl
   Source_Files {
     server.cpp
+    TestC.cpp
+    TestS.cpp
     MyInterfaceImpl.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Client): taoserver, iortable {
   exename = client
-  idlflags += -Gp -Gd -Sa -St
+  after += *idl
   after += *Server
   Source_Files {
     client.cpp
+    TestC.cpp
+    TestS.cpp
     MyInterfaceImpl.cpp
   }
+  IDL_Files {
+  }
 }
diff --git a/TAO/tests/Bug_2289_Regression/Makefile.am b/TAO/tests/Bug_2289_Regression/Makefile.am
index 8378354b686..b30d79274cf 100644
--- a/TAO/tests/Bug_2289_Regression/Makefile.am
+++ b/TAO/tests/Bug_2289_Regression/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.Bug_2289_Regression_Server.am
-
-if BUILD_EXCEPTIONS
+## Makefile.Bug_2289_Regression_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) -Gp -Gd -Sa -St $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gp -Gd -Sa -St $(srcdir)/Test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Test.idl
+
+## Makefile.Bug_2289_Regression_Server.am
+
+if BUILD_EXCEPTIONS
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -60,11 +64,7 @@ server_SOURCES = \
   TestC.cpp \
   TestS.cpp \
   server.cpp \
-  MyInterfaceImpl.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  MyInterfaceImpl.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
@@ -79,29 +79,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) -Gp -Gd -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -115,11 +92,7 @@ client_SOURCES = \
   TestC.cpp \
   TestS.cpp \
   client.cpp \
-  MyInterfaceImpl.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  MyInterfaceImpl.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \