ChangeLogTag: Fri Dec 15 16:32:35 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 43 insertions, 56 deletions

diff --git a/TAO/tests/ORT/Makefile.am b/TAO/tests/ORT/Makefile.am
index ccd65bdb895..d24462ddfb7 100644
--- a/TAO/tests/ORT/Makefile.am
+++ b/TAO/tests/ORT/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.Test_ORT_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_INTERCEPTORS
+## Makefile.Test_ORT_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   ORT_testC.cpp \
   ORT_testC.h \
   ORT_testC.inl \
@@ -33,7 +28,7 @@ BUILT_SOURCES += \
   ORT_testS.h \
   ORT_testS.inl
 
-CLEANFILES += \
+CLEANFILES = \
   ORT_test-stamp \
   ORT_testC.cpp \
   ORT_testC.h \
@@ -45,30 +40,38 @@ CLEANFILES += \
 ORT_testC.cpp ORT_testC.h ORT_testC.inl ORT_testS.cpp ORT_testS.h ORT_testS.inl: ORT_test-stamp
 
 ORT_test-stamp: $(srcdir)/ORT_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/ORT_test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ORT_test.idl
 	@touch $@
 
 BUILT_SOURCES += \
   ObjectReferenceFactoryC.cpp \
   ObjectReferenceFactoryC.h \
   ObjectReferenceFactoryC.inl \
-  ObjectReferenceFactoryS.h \
-  ObjectReferenceFactoryS.inl
+  ObjectReferenceFactoryS.h
 
 CLEANFILES += \
   ObjectReferenceFactory-stamp \
   ObjectReferenceFactoryC.cpp \
   ObjectReferenceFactoryC.h \
   ObjectReferenceFactoryC.inl \
-  ObjectReferenceFactoryS.h \
-  ObjectReferenceFactoryS.inl
+  ObjectReferenceFactoryS.h
 
-ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.h ObjectReferenceFactoryS.inl: ObjectReferenceFactory-stamp
+ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.h: ObjectReferenceFactory-stamp
 
 ObjectReferenceFactory-stamp: $(srcdir)/ObjectReferenceFactory.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/ObjectReferenceFactory.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -SS $(srcdir)/ObjectReferenceFactory.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  ORT_test.idl \
+  ObjectReferenceFactory.idl
+
+## Makefile.Test_ORT_Server.am
+
+if BUILD_EXCEPTIONS
+if BUILD_INTERCEPTORS
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -87,17 +90,9 @@ server_SOURCES = \
   ServerORBInitializer.cpp \
   ServerRequestInterceptor.cpp \
   server.cpp \
-  ORT_testC.h \
-  ORT_testC.inl \
-  ORT_testS.h \
-  ORT_testS.inl \
   ORT_test_IORInterceptor.h \
   ORT_test_i.h \
   ObjectReferenceFactory.h \
-  ObjectReferenceFactoryC.h \
-  ObjectReferenceFactoryC.inl \
-  ObjectReferenceFactoryS.h \
-  ObjectReferenceFactoryS.inl \
   ServerORBInitializer.h \
   ServerRequestInterceptor.h
 
@@ -121,27 +116,6 @@ endif BUILD_EXCEPTIONS
 if BUILD_EXCEPTIONS
 if BUILD_INTERCEPTORS
 
-BUILT_SOURCES += \
-  ORT_testC.cpp \
-  ORT_testC.h \
-  ORT_testC.inl \
-  ORT_testS.h \
-  ORT_testS.inl
-
-CLEANFILES += \
-  ORT_test-stamp \
-  ORT_testC.cpp \
-  ORT_testC.h \
-  ORT_testC.inl \
-  ORT_testS.h \
-  ORT_testS.inl
-
-ORT_testC.cpp ORT_testC.h ORT_testC.inl ORT_testS.h ORT_testS.inl: ORT_test-stamp
-
-ORT_test-stamp: $(srcdir)/ORT_test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/ORT_test.idl
-	@touch $@
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -153,10 +127,11 @@ client_CPPFLAGS = \
 client_SOURCES = \
   ORT_testC.cpp \
   client.cpp \
-  ORT_testC.h \
-  ORT_testC.inl \
-  ORT_testS.h \
-  ORT_testS.inl
+  ORT_test_IORInterceptor.h \
+  ORT_test_i.h \
+  ObjectReferenceFactory.h \
+  ServerORBInitializer.h \
+  ServerRequestInterceptor.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc
index 461f03a1a7b..4d4b4688fc0 100644
--- a/TAO/tests/ORT/ORT.mpc
+++ b/TAO/tests/ORT/ORT.mpc
@@ -1,16 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server, interceptors {
+project(Test_ORT_IDL): taoidldefaults {
   IDL_Files {
     ORT_test.idl
+  }
+  IDL_Files {
+    idlflags += -SS
     ObjectReferenceFactory.idl
   }
+  custom_only = 1
+}
 
+project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server, interceptors {
+  after += Test_ORT_IDL
   Source_Files {
-    ORT_testC.cpp
-    ORT_testS.cpp
-    ObjectReferenceFactoryC.cpp
     ObjectReferenceFactory.cpp
     ORT_test_i.cpp
     ServerORBInitializer.cpp
@@ -18,18 +22,26 @@ project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server,
     ORT_test_IORInterceptor.cpp
     server.cpp
   }
+  Source_Files {
+    ORT_testC.cpp
+    ORT_testS.cpp
+    ObjectReferenceFactoryC.cpp
+  }
+  IDL_Files {
+  }
 }
 
 
 project(Test_ORT_Client): taoclient, anytypecode, interceptors {
+  after += Test_ORT_IDL
   after += Test_ORT_Server
 
-  IDL_Files {
-    ORT_test.idl
+  Source_Files {
+    client.cpp
   }
-
   Source_Files {
     ORT_testC.cpp
-    client.cpp
+  }
+  IDL_Files {
   }
 }