ChangeLogTag: Fri Feb 25 07:00:19 2005 J.T. Conklin <jtc@acorntoolworks.com>

6 files changed, 135 insertions, 48 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 14d17978573..6a0aa593b96 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,25 @@
+Fri Feb 25 07:00:19 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
+
+	  Regenerated.
+
+	* orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc:
+
+	  Added new project just for IDL generation using the new MPC
+	  "custom_only" feature.  This avoids problems in MPC's automake
+	  support when aggregating multiple project Makefile.am's that
+	  each contain rules to compile the IDL files.
+
+	* orbsvcs/orbsvcs/CosNaming.mpc:
+	* orbsvcs/orbsvcs/CosTrading.mpc:
+	* orbsvcs/orbsvcs/DsLogAdmin.mpc:
+
+	  Added new project just for IDL generation using the new MPC
+	  "custom_only" feature.  This avoids a MPC bug where only source
+	  files which are actually used in a project that compiles an IDL
+	  file are added to the list of output files.
+
 Fri Feb 25 14:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/POA/wait_for_completion/wait_for_completion.mpc:
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index 614cab7ba66..e86766a3722 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,14 +1,25 @@
 // -*- MPC -*-
 // $Id$
 
+project(CosNaming_IDL) : orbsvcslib, core {
+
+  custom_only = 1
+
+  idlflags    += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
+
+  IDL_Files {
+    CosNaming.idl
+  }
+}
+
+
 project(CosNaming) : orbsvcslib, core {
+  after += CosNaming_IDL
   sharedname   = TAO_CosNaming
   dynamicflags = TAO_NAMING_BUILD_DLL
 
-  idlflags    += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
 
   IDL_Files {
-    CosNaming.idl
   }
 
   Source_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 86dbc908354..3fe8e934b63 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTrading) : orbsvcslib, core, utils {
-  sharedname   = TAO_CosTrading
-  dynamicflags = TAO_TRADING_BUILD_DLL
+project(CosTrading_IDL) : orbsvcslib, core {
+
+  custom_only = 1
 
   idlflags    += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
 
@@ -12,6 +12,16 @@ project(CosTrading) : orbsvcslib, core, utils {
     CosTradingRepos.idl
     CosTradingDynamic.idl
   }
+}
+
+
+project(CosTrading) : orbsvcslib, core, utils {
+  after += CosTrading_IDL
+  sharedname   = TAO_CosTrading
+  dynamicflags = TAO_TRADING_BUILD_DLL
+
+  IDL_Files {
+  }
 
   Source_Files {
     CosTradingC.cpp
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index d96bff3f1dc..4e303242c63 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsLogAdmin) : orbsvcslib, core {
-  sharedname   = TAO_DsLogAdmin
-  dynamicflags = TAO_LOG_BUILD_DLL
+project(DsLogAdmin_IDL) : orbsvcslib, core {
+
+  custom_only = 1
 
   idlflags    += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
 
@@ -11,6 +11,16 @@ project(DsLogAdmin) : orbsvcslib, core {
     DsLogAdmin.idl
     DsLogNotification.idl
   }
+}
+
+
+project(DsLogAdmin) : orbsvcslib, core {
+  after += DsLogAdmin_IDL
+  sharedname   = TAO_DsLogAdmin
+  dynamicflags = TAO_LOG_BUILD_DLL
+
+  IDL_Files {
+  }
 
   Source_Files {
     DsLogAdminC.cpp
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
index 4f1c2eb5531..299aa60fc55 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
@@ -1,8 +1,22 @@
 // $Id$
+project(*Performance_IDL): loadbalancing {
+
+  custom_only = 1
+
+  IDL_Files {
+    Test.idl
+  }
+}
+
 project(*Performance_Server): loadbalancing, strategies {
-  includes += $(TAO_ROOT)/orbsvcs
+  after += *Performance_IDL
+
+  IDL_Files {
+  }
 
   Source_Files {
+    TestC.cpp
+    TestS.cpp
     server.cpp
     Roundtrip.cpp
     ORBInitializer.cpp
@@ -12,6 +26,11 @@ project(*Performance_Server): loadbalancing, strategies {
 }
 
 project(*Performance_Client): loadbalancing, strategies {
+  after += *Performance_IDL
+
+  IDL_Files {
+  }  
+
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
index cd61a7074dc..bbf29229e5e 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
@@ -1,52 +1,72 @@
 ##  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)
 
-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
 
+noinst_PROGRAMS =
+CLEANFILES =
+BUILT_SOURCES =
+
+## Makefile.LoadBalancing_Performance_IDL.am
+
 if BUILD_AMI
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES = \
-  TestS_T.cpp \
+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 $@
 
-endif
-endif
 
-## Makefile.LoadBalancing_Performance_Client.am 
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.LoadBalancing_Performance_Client.am
 
 if BUILD_AMI
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = client
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -59,33 +79,33 @@ client_CPPFLAGS = \
 client_SOURCES = \
   TestC.cpp \
   client.cpp \
-  TestC.h \
-  TestS_T.h \
-  TestC.inl \
-  TestS_T.inl
+  ORBInitializer.h \
+  RPS_Monitor.h \
+  Roundtrip.h \
+  ServerRequestInterceptor.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.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.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
-## Makefile.LoadBalancing_Performance_Server.am 
+## Makefile.LoadBalancing_Performance_Server.am
 
 if BUILD_AMI
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -109,35 +129,30 @@ server_SOURCES = \
   ORBInitializer.h \
   RPS_Monitor.h \
   Roundtrip.h \
-  ServerRequestInterceptor.h \
-  TestC.h \
-  TestS.h \
-  TestS_T.h \
-  TestC.inl \
-  TestS.inl \
-  TestS_T.inl
+  ServerRequestInterceptor.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.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.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
 ## 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