ChangeLogTag: Fri Feb 25 21:58:39 2005 J.T. Conklin <jtc@acorntoolworks.com>

10 files changed, 341 insertions, 218 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5b66eeac26f..7760dbbfd77 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Fri Feb 25 21:58:39 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
+
+	  Regenerated.
+
+	* orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc:
+	* orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc:
+
+	  Add new project for IDL generation.
+
 Fri Feb 25 18:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Domain/DomainS.{h,cpp,inl}:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
index 8dc4125af66..b555f58550b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
@@ -1,27 +1,22 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
 
-## Makefile.Colocated_Roundtrip.am 
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc
+noinst_PROGRAMS =
 
-## Makefile.Colocated_Roundtrip.am 
+## Makefile.Colocated_Roundtrip.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = driver
+noinst_PROGRAMS += driver
 
 driver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -30,7 +25,8 @@ driver_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
+  -I$(srcdir)/../lib \
+  -I../lib
 
 driver_SOURCES = \
   driver.cpp
@@ -42,20 +38,21 @@ driver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
index 35389e0fc54..269568019a5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
@@ -1,16 +1,22 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
 
-## Makefile.Federated_Roundtrip_Client.am 
+## Makefile.Federated_Roundtrip_Client.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = client
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -32,20 +38,20 @@ client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.Federated_Roundtrip_Server.am 
+## Makefile.Federated_Roundtrip_Server.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
@@ -71,20 +77,21 @@ server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
index 627c474cd27..68bf1dda667 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
@@ -1,64 +1,82 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
 
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_builddir)/TAO_IDL/tao_idl
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(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
 
-BUILT_SOURCES = \
-  TestS_T.cpp \
+noinst_PROGRAMS =
+CLEANFILES =
+BUILT_SOURCES =
+
+## Makefile.RTCORBA_Baseline_Idl.am
+
+if BUILD_CORBA_MESSAGING
+if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
+
+BUILT_SOURCES += \
   TestC.inl \
   TestS.inl \
   TestS_T.inl \
-  TestC.cpp \
   TestC.h \
   TestS.h \
-  TestS_T.h
+  TestS_T.h \
+  TestC.cpp \
+  TestS.cpp \
+  TestS_T.cpp
 
-CLEANFILES = \
-  TestS_T.cpp \
+CLEANFILES += \
+  Test-stamp \
   TestC.inl \
   TestS.inl \
   TestS_T.inl \
-  TestC.cpp \
   TestC.h \
   TestS.h \
   TestS_T.h \
-  Test-stamp
+  TestC.cpp \
+  TestS.cpp \
+  TestS_T.cpp
 
-TestS_T.cpp TestC.inl TestS.inl TestS_T.inl TestC.cpp TestC.h TestS.h TestS_T.h: Test-stamp
+TestC.inl TestS.inl TestS_T.inl TestC.h TestS.h TestS_T.h TestC.cpp TestS.cpp TestS_T.cpp: Test-stamp
 
 Test-stamp: $(srcdir)/Test.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
 	@touch $@
 
-## Makefile.RTCORBA_Baseline_Client.am 
 
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RTCORBA_Baseline_Client.am
+
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
-noinst_PROGRAMS = client
-endif
-endif
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(srcdir)/../lib \
-  -I../lib \
-  -I$(TAO_ROOT)/orbsvcs
+  -I../lib
 
 client_SOURCES = \
   TestC.cpp \
   client.cpp \
-  TestC.h \
-  TestS_T.h \
-  TestC.inl \
-  TestS_T.inl
+  Roundtrip.h
 
 client_LDADD = \
   ../lib/libTAO_RTEC_Perf.la \
@@ -67,45 +85,41 @@ client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.RTCORBA_Baseline_Server.am 
+## Makefile.RTCORBA_Baseline_Server.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += server
-endif
-endif
 
 server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(srcdir)/../lib \
-  -I../lib \
-  -I$(TAO_ROOT)/orbsvcs
+  -I../lib
 
 server_SOURCES = \
   Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
   server.cpp \
-  Roundtrip.h \
-  TestC.h \
-  TestS.h \
-  TestS_T.h \
-  TestC.inl \
-  TestS.inl \
-  TestS_T.inl
+  TestS.cpp \
+  TestC.cpp \
+  Roundtrip.h
 
 server_LDADD = \
   ../lib/libTAO_RTEC_Perf.la \
@@ -114,18 +128,21 @@ server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
index 21b9f66db74..e06d042b76c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -1,20 +1,39 @@
 // $Id$
+
+project(*idl): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+  custom_only = 1
+
+  IDL_Files {
+    Test.idl
+  }
+}
+
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+  after    += *idl
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
 
+  IDL_Files {
+  }
+
   Source_Files {
     server.cpp
     Roundtrip.cpp
+    TestS.cpp
+    TestC.cpp
   }
 }
 
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+  after    += *idl
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
 
+  IDL_Files {
+  }
+
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
index 696c36642aa..788413b7e50 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
@@ -1,71 +1,84 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
 
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_builddir)/TAO_IDL/tao_idl
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(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
 
-BUILT_SOURCES = \
-  TestS_T.cpp \
+noinst_PROGRAMS =
+CLEANFILES =
+BUILT_SOURCES =
+
+## Makefile.RTCORBA_Callback_Idl.am
+
+if BUILD_CORBA_MESSAGING
+if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
+
+BUILT_SOURCES += \
   TestC.inl \
   TestS.inl \
   TestS_T.inl \
-  TestC.cpp \
-  TestS.cpp \
   TestC.h \
   TestS.h \
-  TestS_T.h
+  TestS_T.h \
+  TestC.cpp \
+  TestS.cpp \
+  TestS_T.cpp
 
-CLEANFILES = \
-  TestS_T.cpp \
+CLEANFILES += \
+  Test-stamp \
   TestC.inl \
   TestS.inl \
   TestS_T.inl \
-  TestC.cpp \
-  TestS.cpp \
   TestC.h \
   TestS.h \
   TestS_T.h \
-  Test-stamp
+  TestC.cpp \
+  TestS.cpp \
+  TestS_T.cpp
 
-TestS_T.cpp TestC.inl TestS.inl TestS_T.inl TestC.cpp TestS.cpp TestC.h TestS.h TestS_T.h: Test-stamp
+TestC.inl TestS.inl TestS_T.inl TestC.h TestS.h TestS_T.h TestC.cpp TestS.cpp TestS_T.cpp: Test-stamp
 
 Test-stamp: $(srcdir)/Test.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl
 	@touch $@
 
-## Makefile.RTCORBA_Callback_Client.am 
 
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RTCORBA_Callback_Client.am
+
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
-noinst_PROGRAMS = client
-endif
-endif
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(srcdir)/../lib \
-  -I../lib \
-  -I$(TAO_ROOT)/orbsvcs
+  -I../lib
 
 client_SOURCES = \
   Callback.cpp \
-  TestC.cpp \
   TestS.cpp \
+  TestC.cpp \
   client.cpp \
-  Callback.h \
-  TestC.h \
-  TestS.h \
-  TestS_T.h \
-  TestC.inl \
-  TestS.inl \
-  TestS_T.inl
+  Callback.h
 
 client_LDADD = \
   ../lib/libTAO_RTEC_Perf.la \
@@ -74,47 +87,43 @@ client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.RTCORBA_Callback_Server.am 
+## Makefile.RTCORBA_Callback_Server.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += server
-endif
-endif
 
 server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(srcdir)/../lib \
-  -I../lib \
-  -I$(TAO_ROOT)/orbsvcs
+  -I../lib
 
 server_SOURCES = \
   Session.cpp \
   Session_Factory.cpp \
-  TestC.cpp \
   TestS.cpp \
+  TestC.cpp \
   server.cpp \
   Session.h \
-  Session_Factory.h \
-  TestC.h \
-  TestS.h \
-  TestS_T.h \
-  TestC.inl \
-  TestS.inl \
-  TestS_T.inl
+  Session_Factory.h
 
 server_LDADD = \
   ../lib/libTAO_RTEC_Perf.la \
@@ -123,18 +132,21 @@ server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
index b0f8e782677..8481a99a045 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -1,23 +1,43 @@
 // $Id$
+project(*idl): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+  custom_only = 1
+
+  IDL_Files {
+    Test.idl
+  }
+}
+
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+  after    += *idl
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
 
+  IDL_Files {
+  }
+
   Source_Files {
     server.cpp
     Session.cpp
     Session_Factory.cpp
+    TestS.cpp
+    TestC.cpp
   }
 }
 
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
+  after    += *idl
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   includes += ../lib $(TAO_ROOT)/orbsvcs
 
+  IDL_Files {
+  }
+
   Source_Files {
     client.cpp
     Callback.cpp
+    TestS.cpp
+    TestC.cpp
   }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
index 68b44feb232..c413df656d9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
@@ -1,16 +1,22 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
 
-## Makefile.Roundtrip_RTEvent_Client.am 
+## Makefile.Roundtrip_RTEvent_Client.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = client
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -19,7 +25,8 @@ client_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
+  -I$(srcdir)/../lib \
+  -I../lib
 
 client_SOURCES = \
   client.cpp
@@ -31,20 +38,20 @@ client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.Roundtrip_RTEvent_Server.am 
+## Makefile.Roundtrip_RTEvent_Server.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
@@ -57,7 +64,8 @@ server_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib
+  -I$(srcdir)/../lib \
+  -I../lib
 
 server_SOURCES = \
   server.cpp
@@ -69,20 +77,21 @@ server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
index 4e9530adcee..373314a8017 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
@@ -1,26 +1,37 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
 
-## Makefile.TCP_Baseline_Client.am 
+## Makefile.TCP_Baseline_Client.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
-noinst_PROGRAMS = client
-endif
-endif
+
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(srcdir)/../lib \
-  -I../lib \
-  -I$(TAO_ROOT)/orbsvcs
+  -I../lib
 
 client_SOURCES = \
   client.cpp
@@ -32,32 +43,34 @@ client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.TCP_Baseline_Server.am 
+## Makefile.TCP_Baseline_Server.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += server
-endif
-endif
 
 server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(srcdir)/../lib \
-  -I../lib \
-  -I$(TAO_ROOT)/orbsvcs
+  -I../lib
 
 server_SOURCES = \
   server.cpp
@@ -69,18 +82,21 @@ server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
index 6c2446b7e0a..c8aeda21408 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
@@ -1,48 +1,56 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
 
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_builddir)/TAO_IDL/tao_idl
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(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
 
-## Makefile.RTEC_Perf.am 
+noinst_LTLIBRARIES =
+CLEANFILES =
+BUILT_SOURCES =
+
+## Makefile.RTEC_Perf.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES = \
-  Federated_TestS_T.cpp \
+BUILT_SOURCES += \
   Federated_TestC.inl \
   Federated_TestS.inl \
   Federated_TestS_T.inl \
-  Federated_TestC.cpp \
-  Federated_TestS.cpp \
   Federated_TestC.h \
   Federated_TestS.h \
-  Federated_TestS_T.h
+  Federated_TestS_T.h \
+  Federated_TestC.cpp \
+  Federated_TestS.cpp \
+  Federated_TestS_T.cpp
 
-CLEANFILES = \
-  Federated_TestS_T.cpp \
+CLEANFILES += \
+  Federated_Test-stamp \
   Federated_TestC.inl \
   Federated_TestS.inl \
   Federated_TestS_T.inl \
-  Federated_TestC.cpp \
-  Federated_TestS.cpp \
   Federated_TestC.h \
   Federated_TestS.h \
   Federated_TestS_T.h \
-  Federated_Test-stamp
+  Federated_TestC.cpp \
+  Federated_TestS.cpp \
+  Federated_TestS_T.cpp
 
-Federated_TestS_T.cpp Federated_TestC.inl Federated_TestS.inl Federated_TestS_T.inl Federated_TestC.cpp Federated_TestS.cpp Federated_TestC.h Federated_TestS.h Federated_TestS_T.h: Federated_Test-stamp
+Federated_TestC.inl Federated_TestS.inl Federated_TestS_T.inl Federated_TestC.h Federated_TestS.h Federated_TestS_T.h Federated_TestC.cpp Federated_TestS.cpp Federated_TestS_T.cpp: Federated_Test-stamp
 
 Federated_Test-stamp: $(srcdir)/Federated_Test.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl
 	@touch $@
 
-noinst_LTLIBRARIES = libTAO_RTEC_Perf.la
+noinst_LTLIBRARIES += libTAO_RTEC_Perf.la
 
 libTAO_RTEC_Perf_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -88,8 +96,8 @@ libTAO_RTEC_Perf_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTEC_Perf_la_LIBADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
@@ -97,90 +105,91 @@ libTAO_RTEC_Perf_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 noinst_HEADERS = \
+  Auto_Disconnect.cpp \
   Auto_Disconnect.h \
+  Auto_Disconnect.inl \
   Client_Group.h \
+  Client_Group.inl \
   Client_Options.h \
   Client_Pair.h \
+  Client_Pair.inl \
   Consumer.h \
   Control.h \
   EC_Destroyer.h \
+  EC_Destroyer.inl \
+  Federated_Test.idl \
   Federated_TestC.h \
+  Federated_TestC.inl \
   Federated_TestS.h \
+  Federated_TestS.inl \
+  Federated_TestS_T.cpp \
   Federated_TestS_T.h \
+  Federated_TestS_T.inl \
   Implicit_Deactivator.h \
+  Implicit_Deactivator.inl \
   Loopback.h \
   Loopback_Consumer.h \
   Loopback_Pair.h \
+  Loopback_Pair.inl \
   Loopback_Supplier.h \
+  Low_Priority_Setup.cpp \
   Low_Priority_Setup.h \
+  Low_Priority_Setup.inl \
   ORB_Holder.h \
+  ORB_Holder.inl \
   ORB_Shutdown.h \
+  ORB_Shutdown.inl \
   ORB_Task.h \
+  ORB_Task.inl \
   ORB_Task_Activator.h \
+  ORB_Task_Activator.inl \
   Peer_Base.h \
   PriorityBand_Setup.h \
+  PriorityBand_Setup.inl \
+  RIR_Narrow.cpp \
   RIR_Narrow.h \
   RTCORBA_Setup.h \
+  RTCORBA_Setup.inl \
   RTClient_Setup.h \
+  RTClient_Setup.inl \
   RTEC_Initializer.h \
   RTPOA_Setup.h \
+  RTPOA_Setup.inl \
   RTServer_Setup.h \
+  RTServer_Setup.inl \
   RT_Class.h \
+  RT_Class.inl \
   Send_Task.h \
   Send_Task_Stopper.h \
+  Send_Task_Stopper.inl \
+  Servant_var.cpp \
   Servant_var.h \
+  Servant_var.inl \
+  Shutdown.cpp \
   Shutdown.h \
+  Shutdown.inl \
   Supplier.h \
   SyncScope_Setup.h \
-  Task_Activator.h \
-  rtec_perf_export.h \
-  Auto_Disconnect.inl \
-  Client_Group.inl \
-  Client_Pair.inl \
-  EC_Destroyer.inl \
-  Federated_TestC.inl \
-  Federated_TestS.inl \
-  Federated_TestS_T.inl \
-  Implicit_Deactivator.inl \
-  Loopback_Pair.inl \
-  Low_Priority_Setup.inl \
-  ORB_Holder.inl \
-  ORB_Shutdown.inl \
-  ORB_Task.inl \
-  ORB_Task_Activator.inl \
-  PriorityBand_Setup.inl \
-  RTCORBA_Setup.inl \
-  RTClient_Setup.inl \
-  RTPOA_Setup.inl \
-  RTServer_Setup.inl \
-  RT_Class.inl \
-  Send_Task_Stopper.inl \
-  Servant_var.inl \
-  Shutdown.inl \
   SyncScope_Setup.inl \
-  Task_Activator.inl \
-  Auto_Disconnect.cpp \
-  Federated_TestS_T.cpp \
-  Low_Priority_Setup.cpp \
-  RIR_Narrow.cpp \
-  Servant_var.cpp \
-  Shutdown.cpp \
   Task_Activator.cpp \
-  Federated_Test.idl
+  Task_Activator.h \
+  Task_Activator.inl \
+  rtec_perf_export.h
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB