ChangeLogTag: Wed Nov 29 02:51:19 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 28 insertions, 40 deletions

diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
index d21cced480b..200f90a2812 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
@@ -1,16 +1,28 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Foo.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): csd_threadpool, taoserver, pi {
   exename = server_main
+  after += *idl
 
   Source_Files {
+    FooS.cpp
+    FooC.cpp
     Foo_i.cpp
     FooServantList.cpp
     ServerApp.cpp
     server_main.cpp
     OrbShutdownTask.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Client): taoexe, anytypecode {
@@ -22,5 +34,6 @@ project(*Client): taoexe, anytypecode {
     ClientApp.cpp
     client_main.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
index 5d1971f6945..1b4902a8d21 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
@@ -16,16 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.CSD_Test_ThreadPool2_Server.am
+## Makefile.CSD_Test_ThreadPool2_Idl.am
 
-if BUILD_EXCEPTIONS
-if BUILD_THREADS
-
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   FooC.cpp \
   FooC.h \
   FooC.inl \
@@ -33,7 +28,7 @@ BUILT_SOURCES += \
   FooS.h \
   FooS.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Foo-stamp \
   FooC.cpp \
   FooC.h \
@@ -45,9 +40,18 @@ CLEANFILES += \
 FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
 
 Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Foo.idl
+
+## Makefile.CSD_Test_ThreadPool2_Server.am
+
+if BUILD_EXCEPTIONS
+if BUILD_THREADS
+
 noinst_PROGRAMS += server_main
 
 server_main_CPPFLAGS = \
@@ -64,10 +68,6 @@ server_main_SOURCES = \
   OrbShutdownTask.cpp \
   ServerApp.cpp \
   server_main.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
   FooServantList.h \
   Foo_i.h \
   OrbShutdownTask.h \
@@ -90,27 +90,6 @@ endif BUILD_EXCEPTIONS
 
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
 noinst_PROGRAMS += client_main
 
 client_main_CPPFLAGS = \
@@ -123,11 +102,7 @@ client_main_SOURCES = \
   ClientApp.cpp \
   FooC.cpp \
   client_main.cpp \
-  ClientApp.h \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl
+  ClientApp.h
 
 client_main_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \