ChangeLogTag: Thu Nov 30 05:52:05 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 30 insertions, 40 deletions

diff --git a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am b/TAO/tests/RTCORBA/Client_Propagated/Makefile.am
index fbf76664535..0692cc39c09 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am
+++ b/TAO/tests/RTCORBA/Client_Propagated/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.RTCORBA_Client_Propagated_Server.am
+## Makefile.RTCORBA_Client_Propagated_Idl.am
 
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-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.RTCORBA_Client_Propagated_Server.am
+
+if BUILD_EXCEPTIONS
+if BUILD_RT_CORBA
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -60,10 +64,8 @@ server_SOURCES = \
   server.cpp \
   testC.cpp \
   testS.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
+  Client_ORBInitializer.h \
+  interceptors.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
@@ -84,27 +86,6 @@ if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 if BUILD_RT_CORBA
 
-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 = \
@@ -119,11 +100,7 @@ client_SOURCES = \
   interceptors.cpp \
   testC.cpp \
   Client_ORBInitializer.h \
-  interceptors.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
+  interceptors.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
index 9f0ce92c6ea..083f7252710 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
+++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
@@ -1,9 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): rt_server {
+  after += *idl
   Source_Files {
     server.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
@@ -15,5 +27,6 @@ project(*Client): rt_client, interceptors {
     Client_ORBInitializer.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-