ChangeLogTag: Wed Dec 28 17:07:23 2005 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 36 insertions, 82 deletions

diff --git a/TAO/examples/AMH/Sink_Server/Makefile.am b/TAO/examples/AMH/Sink_Server/Makefile.am
index 7e10653f322..a599b3a24c5 100644
--- a/TAO/examples/AMH/Sink_Server/Makefile.am
+++ b/TAO/examples/AMH/Sink_Server/Makefile.am
@@ -16,42 +16,49 @@ 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.Sink_Server_Client.am
+## Makefile.Sink_Server_IDL.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
   TestC.inl \
+  TestS.cpp \
   TestS.h \
   TestS.inl \
   TestS_T.cpp \
   TestS_T.h \
   TestS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Test-stamp \
   TestC.cpp \
   TestC.h \
   TestC.inl \
+  TestS.cpp \
   TestS.h \
   TestS.inl \
   TestS_T.cpp \
   TestS_T.h \
   TestS_T.inl
 
-TestC.cpp TestC.h TestC.inl TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
+TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
 
 Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
 	@touch $@
 
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.Sink_Server_Client.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -64,12 +71,8 @@ client_SOURCES = \
   Client_Task.cpp \
   TestC.cpp \
   client.cpp \
-  Client_Task.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS_T.h \
-  TestS_T.inl
+  Base_Server.inl \
+  Client_Task.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -90,35 +93,6 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl \
-  TestS_T.cpp \
-  TestS_T.h \
-  TestS_T.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl \
-  TestS_T.cpp \
-  TestS_T.h \
-  TestS_T.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
 noinst_PROGRAMS += mt_server
 
 mt_server_CPPFLAGS = \
@@ -139,11 +113,6 @@ mt_server_SOURCES = \
   Base_Server.h \
   Base_Server.inl \
   MT_AMH_Server.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS_T.h \
-  TestS_T.inl \
   Timer_Handler.h
 
 mt_server_LDADD = \
@@ -165,35 +134,6 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl \
-  TestS_T.cpp \
-  TestS_T.h \
-  TestS_T.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl \
-  TestS_T.cpp \
-  TestS_T.h \
-  TestS_T.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
 noinst_PROGRAMS += st_server
 
 st_server_CPPFLAGS = \
@@ -212,11 +152,6 @@ st_server_SOURCES = \
   AMH_Servant.h \
   Base_Server.h \
   Base_Server.inl \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS_T.h \
-  TestS_T.inl \
   Timer_Handler.h
 
 st_server_LDADD = \
diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
index 17f57558bd0..873085457c1 100644
--- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
+++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
@@ -1,30 +1,49 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL) : taoidldefaults, amh {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only =1
+}
+
 project(*st_server): taoexe, strategies, valuetype, amh, portableserver {
+  after += *IDL
   Source_Files {
     st_server.cpp
     Base_Server.cpp
     AMH_Servant.cpp
     Timer_Handler.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*mt_server): taoexe, strategies, valuetype, amh, portableserver  {
+  after += *IDL
   Source_Files {
     mt_server.cpp
     MT_AMH_Server.cpp
     Base_Server.cpp
     AMH_Servant.cpp
     Timer_Handler.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): taoexe, strategies, valuetype, amh, portableserver  {
+  after += *IDL
   Source_Files {
     Client_Task.cpp
     TestC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-