ChangeLogTag: Tue Dec 27 11:34:29 2005 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 57 insertions, 146 deletions

diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 925b728933e..746dfa9c23a 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,12 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Identity.idl
+    Load_Balancer.idl
+  }
+  custom_only = 1
+}
+
 project(*balancer): taoexe, utils, portableserver, minimum_corba {
   avoids += repo ace_for_tao
   exename = load_balancer
+  after += *IDL
 
   IDL_Files {
-    Load_Balancer.idl
   }
 
   Source_Files {
@@ -19,6 +27,11 @@ project(*balancer): taoexe, utils, portableserver, minimum_corba {
 
 project(*server): taoserver, utils, minimum_corba {
   avoids += repo
+  exename = server
+  after += *IDL
+
+  IDL_Files {
+  }
 
   Source_Files {
     IdentityC.cpp
@@ -32,6 +45,10 @@ project(*server): taoserver, utils, minimum_corba {
 project(*client): taoclient, utils, portableserver, minimum_corba {
   avoids += repo
   exename = client
+  after += *IDL
+
+  IDL_Files {
+  }
 
   Source_Files {
     IdentityC.cpp
@@ -39,4 +56,3 @@ project(*client): taoclient, utils, portableserver, minimum_corba {
     Identity_Client.cpp
   }
 }
-
diff --git a/TAO/examples/Load_Balancing_persistent/Makefile.am b/TAO/examples/Load_Balancing_persistent/Makefile.am
index fa814f9b185..551066e1596 100644
--- a/TAO/examples/Load_Balancing_persistent/Makefile.am
+++ b/TAO/examples/Load_Balancing_persistent/Makefile.am
@@ -16,15 +16,38 @@ 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.Load_Balancing_Persistent_Balancer.am
+## Makefile.Load_Balancing_Persistent_IDL.am
 
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-if !BUILD_REPO
+BUILT_SOURCES = \
+  IdentityC.cpp \
+  IdentityC.h \
+  IdentityC.inl \
+  IdentityS.cpp \
+  IdentityS.h \
+  IdentityS.inl \
+  IdentityS_T.cpp \
+  IdentityS_T.h \
+  IdentityS_T.inl
+
+CLEANFILES = \
+  Identity-stamp \
+  IdentityC.cpp \
+  IdentityC.h \
+  IdentityC.inl \
+  IdentityS.cpp \
+  IdentityS.h \
+  IdentityS.inl \
+  IdentityS_T.cpp \
+  IdentityS_T.h \
+  IdentityS_T.inl
+
+IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp
+
+Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Identity.idl
+	@touch $@
 
 BUILT_SOURCES += \
   Load_BalancerC.cpp \
@@ -52,9 +75,16 @@ CLEANFILES += \
 Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.cpp Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp
 
 Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Load_Balancer.idl
 	@touch $@
 
+
+## Makefile.Load_Balancing_Persistent_Balancer.am
+
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
+if !BUILD_REPO
+
 noinst_PROGRAMS += load_balancer
 
 load_balancer_CPPFLAGS = \
@@ -68,11 +98,6 @@ load_balancer_SOURCES = \
   Load_BalancerS.cpp \
   Load_Balancer_i.cpp \
   Load_Balancing_Service.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl \
   Load_Balancer_i.h \
   Load_Balancing_Service.h
 
@@ -94,60 +119,6 @@ endif !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 if !BUILD_REPO
 
-BUILT_SOURCES += \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-CLEANFILES += \
-  Identity-stamp \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp
-
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Identity.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-CLEANFILES += \
-  Load_Balancer-stamp \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp
-
-Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl
-	@touch $@
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -160,17 +131,7 @@ client_SOURCES = \
   IdentityC.cpp \
   Identity_Client.cpp \
   Load_BalancerC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS_T.h \
-  IdentityS_T.inl \
-  Identity_Client.h \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
+  Identity_Client.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -189,62 +150,6 @@ endif !BUILD_MINIMUM_CORBA
 if !BUILD_MINIMUM_CORBA
 if !BUILD_REPO
 
-BUILT_SOURCES += \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-CLEANFILES += \
-  Identity-stamp \
-  IdentityC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.cpp \
-  IdentityS.h \
-  IdentityS.inl \
-  IdentityS_T.cpp \
-  IdentityS_T.h \
-  IdentityS_T.inl
-
-IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp
-
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Identity.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-CLEANFILES += \
-  Load_Balancer-stamp \
-  Load_BalancerC.cpp \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS.inl \
-  Load_BalancerS_T.cpp \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
-
-Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp
-
-Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -259,18 +164,8 @@ server_SOURCES = \
   Identity_Server.cpp \
   Identity_i.cpp \
   Load_BalancerC.cpp \
-  IdentityC.h \
-  IdentityC.inl \
-  IdentityS.h \
-  IdentityS_T.h \
-  IdentityS_T.inl \
   Identity_Server.h \
-  Identity_i.h \
-  Load_BalancerC.h \
-  Load_BalancerC.inl \
-  Load_BalancerS.h \
-  Load_BalancerS_T.h \
-  Load_BalancerS_T.inl
+  Identity_i.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \