ChangeLogTag: Wed Dec 13 07:19:26 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 34 insertions, 42 deletions

diff --git a/TAO/tests/Stack_Recursion/Makefile.am b/TAO/tests/Stack_Recursion/Makefile.am
index bf5707159fa..92923455d48 100644
--- a/TAO/tests/Stack_Recursion/Makefile.am
+++ b/TAO/tests/Stack_Recursion/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.Stack_Recursion_Server.am
-
-if BUILD_EXCEPTIONS
+## Makefile.Stack_Recursion_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.Stack_Recursion_Server.am
+
+if BUILD_EXCEPTIONS
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -62,11 +66,7 @@ server_SOURCES = \
   TestS.cpp \
   server.cpp \
   Sender.h \
-  Server_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  Server_Task.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -80,27 +80,6 @@ endif BUILD_EXCEPTIONS
 
 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 = \
@@ -113,11 +92,7 @@ client_SOURCES = \
   Client_Task.cpp \
   TestC.cpp \
   client.cpp \
-  Client_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  Client_Task.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index ce10971c433..960ceb8a921 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -1,22 +1,39 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoserver {
+  after += *idl
   Source_Files {
-    TestC.cpp
-    TestS.cpp
     server.cpp
     Server_Task.cpp
     Sender.cpp
   }
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *idl
   after += *Server
   Source_Files {
-    TestC.cpp
     client.cpp
     Client_Task.cpp
   }
+  Source_Files {
+    TestC.cpp
+  }
+  IDL_Files {
+  }
 }