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

2 files changed, 37 insertions, 47 deletions

diff --git a/TAO/tests/Smart_Proxies/Collocation/Makefile.am b/TAO/tests/Smart_Proxies/Collocation/Makefile.am
index d00bbc9fbd9..75431bef7cc 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Makefile.am
+++ b/TAO/tests/Smart_Proxies/Collocation/Makefile.am
@@ -17,35 +17,39 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T
 TAO_ROOT = $(top_srcdir)
 
 noinst_LTLIBRARIES =
-noinst_HEADERS =
-CLEANFILES =
-BUILT_SOURCES =
 
-## Makefile.SP_Collocation_TestStubsLib.am
-
-if BUILD_EXCEPTIONS
+## Makefile.SP_Collocation_Idl.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   DiamondC.cpp \
   DiamondC.h \
   DiamondC.inl \
+  DiamondS.cpp \
   DiamondS.h \
   DiamondS.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Diamond-stamp \
   DiamondC.cpp \
   DiamondC.h \
   DiamondC.inl \
+  DiamondS.cpp \
   DiamondS.h \
   DiamondS.inl
 
-DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.h DiamondS.inl: Diamond-stamp
+DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp
 
 Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd $(srcdir)/Diamond.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd $(srcdir)/Diamond.idl
 	@touch $@
 
+noinst_HEADERS = \
+  Diamond.idl
+
+## Makefile.SP_Collocation_TestStubsLib.am
+
+if BUILD_EXCEPTIONS
+
 noinst_LTLIBRARIES += libColl_Test_Stubs.la
 
 libColl_Test_Stubs_la_CPPFLAGS = \
@@ -60,11 +64,6 @@ libColl_Test_Stubs_la_SOURCES = \
   Smart_Proxy_Impl.cpp
 
 noinst_HEADERS += \
-  Diamond.idl \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.h \
-  DiamondS.inl \
   Smart_Proxy_Impl.h
 
 endif BUILD_EXCEPTIONS
@@ -73,27 +72,6 @@ endif BUILD_EXCEPTIONS
 
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-CLEANFILES += \
-  Diamond-stamp \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.cpp \
-  DiamondS.h \
-  DiamondS.inl
-
-DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp
-
-Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Gsp -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd $(srcdir)/Diamond.idl
-	@touch $@
-
 noinst_LTLIBRARIES += libDiamond.la
 
 libDiamond_la_CPPFLAGS = \
@@ -108,11 +86,6 @@ libDiamond_la_SOURCES = \
   Diamond_i.cpp
 
 noinst_HEADERS += \
-  Diamond.idl \
-  DiamondC.h \
-  DiamondC.inl \
-  DiamondS.h \
-  DiamondS.inl \
   Diamond_i.h
 
 endif BUILD_EXCEPTIONS
diff --git a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
index f98a8de4eb9..83844e172c5 100644
--- a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
+++ b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
@@ -1,26 +1,44 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  idlflags     += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd
+
+  IDL_Files {
+    Diamond.idl
+  }
+  custom_only = 1
+}
+
 project(*TestStubsLib): taolib_with_idl, smart_proxies {
+  after        += *idl
+
   sharedname = Coll_Test_Stubs
   dynamicflags += MY_STUB_BUILD_DLL
-  idlflags     += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd
+
   Source_Files {
     DiamondC.cpp
     Smart_Proxy_Impl.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*DiamondLib) : taolib_with_idl, smart_proxies, portableserver {
-  sharedname   = Diamond
+  after        += *idl
   after        += *TestStubsLib
-  libs         += Coll_Test_Stubs
+
+  sharedname   = Diamond
   dynamicflags += DIAMOND_BUILD_DLL
-  idlflags     += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd
+
+  libs         += Coll_Test_Stubs
+
   Source_Files {
     Diamond_i.cpp
     DiamondS.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Test): taoexe, smart_proxies, portableserver, strategies {
@@ -30,7 +48,6 @@ project(*Test): taoexe, smart_proxies, portableserver, strategies {
     Coll_Tester.cpp
     main.cpp
   }
-  idl_files {
+  IDL_Files {
   }
 }
-