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

22 files changed, 285 insertions, 613 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9828cb0bfd5..32ae2fe0cb4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,60 @@
+Tue Dec 27 11:34:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* Makefile.am:
+
+	  Build examples subdirectory.
+
+	* examples/Makefile.am:
+
+	  Disable building CSD_Strategy and RTScheduling subdirectories.
+	  These *.mpc files need major changes to support separate build
+	  directories.  This is too risky to complete within this beta
+	  cycle.
+
+	* performance-tests/Makefile.am:
+
+	  Disable building CSD_Strategy subdirectory.
+	  These *.mpc files need major changes to support separate build
+	  directories.  This is too risky to complete within this beta
+	  cycle.
+
+	* tests/Makefile.am:
+
+	  Disable building CSD_Strategy_Tests subdirectory.
+	  These *.mpc files need major changes to support separate build
+	  directories.  This is too risky to complete within this beta
+	  cycle.
+
+	* examples/Load_Balancing/Makefile.am:
+	* examples/Load_Balancing_persistent/Makefile.am:
+	* examples/POA/Adapter_Activator/Makefile.am:
+	* examples/POA/Explicit_Activation/Makefile.am:
+	* examples/POA/On_Demand_Activation/Makefile.am:
+	* examples/POA/Reference_Counted_Servant/Makefile.am:
+	* examples/POA/TIE/Makefile.am:
+	* examples/Persistent_Grid/Makefile.am:
+	* examples/Simulator/Event_Supplier/Makefile.am:
+
+	  Regenerated.
+
+	* examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
+	* examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
+	* examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
+	* examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc:
+
+          Change automake specific includes definitions to to have both
+	  build dir and source dir relative paths.
+
+	* examples/Load_Balancing/Load_Balancing.mpc:
+	* examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc:
+	* examples/POA/TIE/POA_TIE.mpc:
+	* examples/Persistent_Grid/Persistent_Grid.mpc:
+	* examples/Simulator/Event_Supplier/Event_Supplier.mpc:
+
+          Add *_IDL projects for compiling *.idl files.  This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
 Tue Dec 27 08:22:42 2005  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tao/Profile_Transport_Resolver.cpp:
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index 8f8a67617b4..fc7650f87c6 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -1,56 +1,26 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Top-level Makefile for TAO
+##  Process this file with automake to create Makefile.in
 ##
-##---------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
-
-AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4 -I ../m4
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         TAO_IDL \
         tao \
-	orbsvcs \
+        orbsvcs \
+        examples \
         docs \
-	performance-tests \
-	utils
-
-## For some reason, automake doesn't include acconfig.h in the distribution
-EXTRA_DIST =  \
-  PROBLEM-REPORT-FORM \
-  VERSION \
-  COPYING.sun \
-  LICENSE.sun \
-  README.sun
-
-DISTCLEANFILES = tao-config tao-config.1
+        performance-tests \
+        interop-tests \
+        tests \
+        utils
 
-## release:
-##         $(MAKE) dist distdir=$(PACKAGE)$(VERSION)
-release:
-	$(MAKE) dist
 
-## Directories to include in the distribution but which I am too lazy to
-## create Makefile.am files for.  A Makefile.am for these directories isn't
-## needed anyway.
-TAO_EXTRA_DIST = docs
-
-dist-hook:
-	(cd $(top_srcdir); tar cf - $(TAO_EXTRA_DIST)) | (cd $(distdir); \
-          tar xfBp -)
-	list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \
-          rm -rf $$p; \
-        done
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
 
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index 95ec38c4fcb..e636694850c 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -1,12 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Identity.idl
+    Load_Balancer.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoserver, utils {
   avoids += repo
+  after += *IDL
 
   IDL_Files {
-    Identity.idl
-    Load_Balancer.idl
   }
 
   Source_Files {
@@ -20,11 +27,12 @@ project(*Server): taoserver, utils {
 
 project(*Client): taoclient, utils, portableserver {
   avoids += repo
+  after += *IDL
+
+  // XXX is this dependency necessary?
   after += *Server
 
   IDL_Files {
-    Identity.idl
-    Load_Balancer.idl
   }
 
   Source_Files {
@@ -37,9 +45,9 @@ project(*Client): taoclient, utils, portableserver {
 project(*Balancer): taoserver, utils  {
   exename = load_balancer
   avoids += repo ace_for_tao
+  after += *IDL
 
   IDL_Files {
-    Load_Balancer.idl
   }
 
   Source_Files {
diff --git a/TAO/examples/Load_Balancing/Makefile.am b/TAO/examples/Load_Balancing/Makefile.am
index e8f1317ee55..60cbab630c1 100644
--- a/TAO/examples/Load_Balancing/Makefile.am
+++ b/TAO/examples/Load_Balancing/Makefile.am
@@ -16,14 +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_Balancer.am
+## Makefile.Load_Balancing_IDL.am
 
-if !BUILD_ACE_FOR_TAO
-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 \
@@ -51,9 +75,15 @@ 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_Balancer.am
+
+if !BUILD_ACE_FOR_TAO
+if !BUILD_REPO
+
 noinst_PROGRAMS += load_balancer
 
 load_balancer_CPPFLAGS = \
@@ -67,11 +97,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
 
@@ -91,62 +116,6 @@ endif !BUILD_ACE_FOR_TAO
 
 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 = \
@@ -161,18 +130,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 \
@@ -189,60 +148,6 @@ endif !BUILD_REPO
 
 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 = \
@@ -255,17 +160,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 \
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 \
diff --git a/TAO/examples/Makefile.am b/TAO/examples/Makefile.am
index 470f7f77cce..5f8618523ee 100644
--- a/TAO/examples/Makefile.am
+++ b/TAO/examples/Makefile.am
@@ -14,7 +14,6 @@ SUBDIRS = \
         Advanced \
         Buffered_AMI \
         Buffered_Oneways \
-        CSD_Strategy \
         Callback_Quoter \
         Content_Server \
         Event_Comm \
@@ -28,7 +27,6 @@ SUBDIRS = \
         PluggableUDP \
         Quoter \
         RTCORBA \
-        RTScheduling \
         Simple \
         Simulator \
         TypeCode_Creation \
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile.am b/TAO/examples/POA/Adapter_Activator/Makefile.am
index 5528f3f1fb5..35ec8bd0e7c 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile.am
+++ b/TAO/examples/POA/Adapter_Activator/Makefile.am
@@ -25,7 +25,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant
+  -I$(srcdir)/../Generic_Servant \
+  -I../Generic_Servant
 
 server_SOURCES = \
   server.cpp
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index d9d6f57ac0f..7b4048912d9 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -7,9 +7,8 @@ project(*Server): taoserver, minimum_corba {
 
    specific(automake) {
      includes += $(srcdir)/../Generic_Servant
-   } else {
-     includes += ../Generic_Servant
    }
+   includes += ../Generic_Servant
 
    Source_Files {
     server.cpp
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile.am b/TAO/examples/POA/Explicit_Activation/Makefile.am
index 70e906a7b8e..edcd6f89a04 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile.am
+++ b/TAO/examples/POA/Explicit_Activation/Makefile.am
@@ -29,7 +29,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant
+  -I$(srcdir)/../Generic_Servant \
+  -I../Generic_Servant
 
 server_SOURCES = \
   server.cpp
diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index a130dec96a4..60b77c13641 100644
--- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -7,9 +7,8 @@ project(*Server): taoexe, portableserver, minimum_corba {
 
    specific (automake) {
      includes += $(srcdir)/../Generic_Servant
-   } else {
-     includes += ../Generic_Servant
-   }
+   } 
+   includes += ../Generic_Servant
 
    Source_Files {
     server.cpp
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile.am b/TAO/examples/POA/On_Demand_Activation/Makefile.am
index a2ac2c2ca91..51168ecf5f1 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile.am
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile.am
@@ -25,7 +25,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant
+  -I$(srcdir)/../Generic_Servant \
+  -I../Generic_Servant
 
 server_SOURCES = \
   Servant_Activator.cpp \
diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
index 8f125fc8b4c..7b2742cdd86 100644
--- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
+++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -7,9 +7,8 @@ project(*Server): taoexe, portableserver, minimum_corba {
 
    specific (automake) {
      includes += $(srcdir)/../Generic_Servant
-   } else {
-     includes += ../Generic_Servant
    }
+   includes += ../Generic_Servant
 
    Source_Files {
     server.cpp
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
index b5515bc32b4..0d2f44aa5d9 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
+++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
@@ -25,7 +25,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant
+  -I$(srcdir)/../Generic_Servant \
+  -I../Generic_Servant
 
 server_SOURCES = \
   server.cpp
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
index a130dec96a4..71264867f12 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -7,9 +7,8 @@ project(*Server): taoexe, portableserver, minimum_corba {
 
    specific (automake) {
      includes += $(srcdir)/../Generic_Servant
-   } else {
-     includes += ../Generic_Servant
    }
+   includes += ../Generic_Servant
 
    Source_Files {
     server.cpp
diff --git a/TAO/examples/POA/TIE/Makefile.am b/TAO/examples/POA/TIE/Makefile.am
index 44de877e776..3de7c15847b 100644
--- a/TAO/examples/POA/TIE/Makefile.am
+++ b/TAO/examples/POA/TIE/Makefile.am
@@ -16,42 +16,45 @@ 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.POA_TIE_Client.am
-
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
+## Makefile.POA_TIE_IDL.am
 
-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) $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
+
+## Makefile.POA_TIE_Client.am
+
+if !BUILD_ACE_FOR_TAO
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -63,11 +66,7 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   testC.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl
+  test_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -81,35 +80,6 @@ endif !BUILD_ACE_FOR_TAO
 
 if !BUILD_MINIMUM_CORBA
 
-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) $(srcdir)/test.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -123,11 +93,6 @@ server_SOURCES = \
   testC.cpp \
   testS.cpp \
   test_i.cpp \
-  testC.h \
-  testC.inl \
-  testS.h \
-  testS_T.h \
-  testS_T.inl \
   test_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc
index 753380cdb13..bb4d3be3634 100644
--- a/TAO/examples/POA/TIE/POA_TIE.mpc
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -1,17 +1,32 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL) : taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*Client) : taoclient, anytypecode, minimum_corba {
+  after += *IDL
   avoids += ace_for_tao
   source_files {
     client.cpp
     testC.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Server) : taoserver, minimum_corba {
+  after += *IDL
   source_files {
     test_i.cpp
     server.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Persistent_Grid/Makefile.am b/TAO/examples/Persistent_Grid/Makefile.am
index 65bf1687b80..b6bb61dfc81 100644
--- a/TAO/examples/Persistent_Grid/Makefile.am
+++ b/TAO/examples/Persistent_Grid/Makefile.am
@@ -17,12 +17,13 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T
 TAO_ROOT = $(top_srcdir)
 
 
-## Makefile.Persistent_Grid_Client.am
+## Makefile.Persistent_Grid_IDL.am
 
 BUILT_SOURCES = \
   GridC.cpp \
   GridC.h \
   GridC.inl \
+  GridS.cpp \
   GridS.h \
   GridS.inl \
   GridS_T.cpp \
@@ -34,18 +35,22 @@ CLEANFILES = \
   GridC.cpp \
   GridC.h \
   GridC.inl \
+  GridS.cpp \
   GridS.h \
   GridS.inl \
   GridS_T.cpp \
   GridS_T.h \
   GridS_T.inl
 
-GridC.cpp GridC.h GridC.inl GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
+GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
 
 Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Grid.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Grid.idl
 	@touch $@
 
+
+## Makefile.Persistent_Grid_Client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -59,11 +64,6 @@ client_SOURCES = \
   Grid_Client_i.cpp \
   Simple_util.cpp \
   client.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS_T.h \
-  GridS_T.inl \
   Grid_Client_i.h \
   Simple_util.h
 
@@ -78,33 +78,6 @@ client_LDADD = \
 
 ## Makefile.Persistent_Grid_Persistent_Client.am
 
-BUILT_SOURCES += \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-CLEANFILES += \
-  Grid-stamp \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-GridC.cpp GridC.h GridC.inl GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
-
-Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Grid.idl
-	@touch $@
-
 noinst_PROGRAMS += persistent_client
 
 persistent_client_CPPFLAGS = \
@@ -118,11 +91,6 @@ persistent_client_SOURCES = \
   Persistent_Client_i.cpp \
   Simple_util.cpp \
   persistent_client.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS_T.h \
-  GridS_T.inl \
   Simple_util.h
 
 persistent_client_LDADD = \
@@ -138,35 +106,6 @@ persistent_client_LDADD = \
 
 if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-CLEANFILES += \
-  Grid-stamp \
-  GridC.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.cpp \
-  GridS.h \
-  GridS.inl \
-  GridS_T.cpp \
-  GridS_T.h \
-  GridS_T.inl
-
-GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
-
-Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Grid.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -181,11 +120,6 @@ server_SOURCES = \
   Grid_i.cpp \
   Simple_util.cpp \
   server.cpp \
-  GridC.h \
-  GridC.inl \
-  GridS.h \
-  GridS_T.h \
-  GridS_T.inl \
   Grid_i.h \
   Simple_util.h
 
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index 110ef2c8d34..ee446f09b4c 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -1,29 +1,47 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Grid.idl
+  }
+  custom_only = 1
+}
+
 project(*server): taoserver, utils {
+  after += *IDL
   avoids += ace_for_tao
   Source_Files {
     Grid_i.cpp
     Simple_util.cpp
     server.cpp
+    GridS.cpp
+    GridC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): taoexe, utils, portableserver {
+  after += *IDL
   Source_Files {
     GridC.cpp
     Simple_util.cpp
     Grid_Client_i.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*persistent client): taoexe, utils, portableserver {
+  after += *IDL
   Source_Files {
     GridC.cpp
     Simple_util.cpp
     Persistent_Client_i.cpp
     persistent_client.cpp
   }
+  IDL_Files {
+  }
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
index 256cd9840a2..dd3b916adb2 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
@@ -1,51 +1,65 @@
 // $Id$
-project(*Event_Sup): rtevent_skel, rtsched, namingexe, utils {
-  exename = Event_Sup
 
+project(*IDL): taoidldefaults, anytypecode {
   IDL_Files {
     gendir = .
     ../NavWeap.idl
   }
+  custom_only = 1
+}
+
+project(*Event_Sup): rtevent_skel, rtsched, namingexe, utils {
+  exename = Event_Sup
+  after += *IDL
+
+  IDL_Files {
+  }
+
   Source_Files {
     Event_Sup.cpp
     DOVE_Supplier.cpp
+    NavWeapC.cpp
   }
 }
 
 project(*Event_Con): rtevent_skel, rtsched, namingexe {
   exename = Event_Con
+  after += *IDL
 
   IDL_Files {
-    gendir = .
-    ../NavWeap.idl
   }
+
   Source_Files {
     Event_Con.cpp
+    NavWeapC.cpp
   }
 }
 
 project(*Logging_Sup): rtevent_skel, rtsched, namingexe, utils {
   exename = Logging_Sup
+  after += *IDL
 
   IDL_Files {
-    gendir = .
-    ../NavWeap.idl
   }
+
   Source_Files {
     Logging_Sup.cpp
     DOVE_Supplier.cpp
+    NavWeapC.cpp
   }
 }
 
 project(*DualEC_Sup): rtevent_serv, rtsched, namingexe, utils {
   exename = DualEC_Sup
+  after += *IDL
 
   IDL_Files {
-    gendir = .
-    ../NavWeap.idl
   }
+
   Source_Files {
     DualEC_Sup.cpp
     DOVE_Supplier.cpp
+    NavWeapS.cpp
+    NavWeapC.cpp
   }
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile.am b/TAO/examples/Simulator/Event_Supplier/Makefile.am
index 204d28638ca..f65a4c09357 100644
--- a/TAO/examples/Simulator/Event_Supplier/Makefile.am
+++ b/TAO/examples/Simulator/Event_Supplier/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.Event_Supplier_DualEC_Sup.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
+## Makefile.Event_Supplier_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   ./NavWeapC.cpp \
   ./NavWeapC.h \
   ./NavWeapC.inl \
@@ -36,7 +31,7 @@ BUILT_SOURCES += \
   ./NavWeapS_T.h \
   ./NavWeapS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   ./NavWeap-stamp \
   ./NavWeapC.cpp \
   ./NavWeapC.h \
@@ -52,9 +47,15 @@ CLEANFILES += \
 
 ./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
 	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/../NavWeap.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/../NavWeap.idl
 	@touch $@
 
+
+## Makefile.Event_Supplier_DualEC_Sup.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += DualEC_Sup
 
 DualEC_Sup_CPPFLAGS = \
@@ -66,15 +67,10 @@ DualEC_Sup_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 DualEC_Sup_SOURCES = \
-  ./NavWeapC.cpp \
-  ./NavWeapS.cpp \
   DOVE_Supplier.cpp \
   DualEC_Sup.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.h \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl \
+  NavWeapC.cpp \
+  NavWeapS.cpp \
   DOVE_Supplier.h \
   DualEC_Sup.h
 
@@ -102,36 +98,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-CLEANFILES += \
-  ./NavWeap-stamp \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-./NavWeapC.cpp ./NavWeapC.h ./NavWeapC.inl ./NavWeapS.cpp ./NavWeapS.h ./NavWeapS.inl ./NavWeapS_T.cpp ./NavWeapS_T.h ./NavWeapS_T.inl: ./NavWeap-stamp
-
-./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
-	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/../NavWeap.idl
-	@touch $@
-
 noinst_PROGRAMS += Event_Con
 
 Event_Con_CPPFLAGS = \
@@ -143,14 +109,8 @@ Event_Con_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 Event_Con_SOURCES = \
-  ./NavWeapC.cpp \
-  ./NavWeapS.cpp \
   Event_Con.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.h \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl \
+  NavWeapC.cpp \
   Event_Con.h
 
 Event_Con_LDADD = \
@@ -174,36 +134,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-CLEANFILES += \
-  ./NavWeap-stamp \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-./NavWeapC.cpp ./NavWeapC.h ./NavWeapC.inl ./NavWeapS.cpp ./NavWeapS.h ./NavWeapS.inl ./NavWeapS_T.cpp ./NavWeapS_T.h ./NavWeapS_T.inl: ./NavWeap-stamp
-
-./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
-	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/../NavWeap.idl
-	@touch $@
-
 noinst_PROGRAMS += Event_Sup
 
 Event_Sup_CPPFLAGS = \
@@ -215,15 +145,9 @@ Event_Sup_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 Event_Sup_SOURCES = \
-  ./NavWeapC.cpp \
-  ./NavWeapS.cpp \
   DOVE_Supplier.cpp \
   Event_Sup.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.h \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl \
+  NavWeapC.cpp \
   DOVE_Supplier.h \
   Event_Sup.h
 
@@ -249,36 +173,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-CLEANFILES += \
-  ./NavWeap-stamp \
-  ./NavWeapC.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.cpp \
-  ./NavWeapS.h \
-  ./NavWeapS.inl \
-  ./NavWeapS_T.cpp \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl
-
-./NavWeapC.cpp ./NavWeapC.h ./NavWeapC.inl ./NavWeapS.cpp ./NavWeapS.h ./NavWeapS.inl ./NavWeapS_T.cpp ./NavWeapS_T.h ./NavWeapS_T.inl: ./NavWeap-stamp
-
-./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
-	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/../NavWeap.idl
-	@touch $@
-
 noinst_PROGRAMS += Logging_Sup
 
 Logging_Sup_CPPFLAGS = \
@@ -290,15 +184,9 @@ Logging_Sup_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 Logging_Sup_SOURCES = \
-  ./NavWeapC.cpp \
-  ./NavWeapS.cpp \
   DOVE_Supplier.cpp \
   Logging_Sup.cpp \
-  ./NavWeapC.h \
-  ./NavWeapC.inl \
-  ./NavWeapS.h \
-  ./NavWeapS_T.h \
-  ./NavWeapS_T.inl \
+  NavWeapC.cpp \
   DOVE_Supplier.h \
   Logging_Sup.h
 
diff --git a/TAO/performance-tests/Makefile.am b/TAO/performance-tests/Makefile.am
index fc36585b24a..acda8f4ea32 100644
--- a/TAO/performance-tests/Makefile.am
+++ b/TAO/performance-tests/Makefile.am
@@ -10,7 +10,6 @@
 
 SUBDIRS = \
         Anyop \
-        CSD_Strategy \
         Callback \
         Cubit \
         Latency \