ChangeLogTag: Sat Dec 23 02:01:44 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 35 insertions, 42 deletions

diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am
index 293c0cbc786..c554ca6c8b1 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/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.Scheduler_Interceptor_Server.am
+## Makefile.Scheduler_Interceptor_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,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.Scheduler_Interceptor_Server.am
+
+if BUILD_EXCEPTIONS
+if BUILD_RT_CORBA
+
 noinst_PROGRAMS += Scheduler_Interceptor_Server
 
 Scheduler_Interceptor_Server_CPPFLAGS = \
@@ -61,11 +64,7 @@ Scheduler_Interceptor_Server_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_server.cpp \
-  ../Scheduler.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
+  ../Scheduler.h
 
 Scheduler_Interceptor_Server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
@@ -87,27 +86,6 @@ endif BUILD_EXCEPTIONS
 if BUILD_EXCEPTIONS
 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 += Scheduler_Interceptor_Client
 
 Scheduler_Interceptor_Client_CPPFLAGS = \
@@ -120,11 +98,7 @@ Scheduler_Interceptor_Client_SOURCES = \
   ../Scheduler.cpp \
   testC.cpp \
   test_client.cpp \
-  ../Scheduler.h \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS.inl
+  ../Scheduler.h
 
 Scheduler_Interceptor_Client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
index a9fce2cd532..63e7ef77111 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
@@ -1,21 +1,40 @@
 // $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): rtscheduling_server {
+  after += *idl
   Source_Files {
     ../Scheduler.cpp
     test_server.cpp
   }
+  Source_Files {
+    testC.cpp
+    testS.cpp
+  }
+  IDL_Files {
+  }
 
   exename = Scheduler_Interceptor_Server
 }
 
 project(*Client) : rtscheduling_client {
+  after += *idl
   after += *Server
   Source_Files {
     ../Scheduler.cpp
-    testC.cpp
     test_client.cpp
   }
+  Source_Files {
+    testC.cpp
+  }
+  IDL_Files {
+  }
 
   exename = Scheduler_Interceptor_Client 
 }
-