Wed Jun 25 17:54:00 2003 Justin Michel <michel_j@ociweb.com>

11 files changed, 50 insertions, 46 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b93ad082ff0..09cb0f632c8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Wed Jun 25 17:54:00 2003  Justin Michel  <michel_j@ociweb.com>
+
+        * orbsvcs/examples/Notify/Lanes/Lanes.mpc:
+        * orbsvcs/orbsvcs/RT_Notification.mpc:
+        * orbsvcs/tests/Event/Mcast/Complex/Complex.mpc:
+        * orbsvcs/tests/Event/Mcast/Simple/Simple.mpc:
+        * orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc:
+        * orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc:
+        * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
+        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
+        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+        * tao/IORInterceptor/IORInterceptor.mpc:
+
+          More mpc file cleanups to push stuff up to base projects.
+
 Wed Jun 25 17:06:18 2003  Chris Cleeland  <cleeland_c@ociweb.com>
 
 	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl: 
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Lanes.mpc b/TAO/orbsvcs/examples/Notify/Lanes/Lanes.mpc
index 96ae396e0ac..d7e6cc023a6 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Lanes.mpc
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Lanes.mpc
@@ -1,6 +1,6 @@
 project(Supplier): notify {
   exename = Supplier
-  libs       += TAO_RT_Notification TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO TAO_RTCORBA
+  libs   += TAO_RT_Notification TAO_RTCORBA
 
   Source_Files {
     Supplier.cpp
@@ -10,7 +10,7 @@ project(Supplier): notify {
 
 project(Consumer): notifytest {
   exename = Consumer
-  libs       += TAO_RT_Notification TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_RT_PortableServer TAO TAO_RTCORBA
+  libs   += TAO_RT_Notification TAO_RTCORBA
 
   Source_Files {
     Consumer.cpp
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
index 0f5f16244e8..4694675960a 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
@@ -1,11 +1,9 @@
-project(RT_Notification) : orbsvcslib, core {
-  after    += Svc_Utils ETCL DynamicAny PortableServer TAO_RTCORBA CosNotification
-  sharedname  = TAO_RT_Notification
-  libs       += TAO_CosNotification TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO TAO_RTCORBA
-  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=Notify/rt_notify_export.h
-  dynamicflags    = TAO_RT_NOTIFY_BUILD_DLL
-  tagchecks   = RT_Notify
-  include_dir = orbsvcs
+project(RT_Notification) : orbsvcslib, core, svc_utils, dynamicany, portableserver, rtcorba, notify {
+  sharedname   = TAO_RT_Notification
+  idlflags    += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=Notify/rt_notify_export.h
+  dynamicflags = TAO_RT_NOTIFY_BUILD_DLL
+  tagchecks    = RT_Notify
+  include_dir  = orbsvcs
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
index 0f1fd636a2a..ecaba4c37da 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
@@ -1,6 +1,6 @@
-project(*supplier): messaging, rteventexe {
-  after  += ECMcastTests_Lib CosNaming IORTable
-  libs     += ECMcastTests TAO_CosNaming TAO_IORTable
+project(*supplier): messaging, rteventexe, naming {
+  after  += ECMcastTests_Lib
+  libs     += ECMcastTests
   includes += ../Common
   exename   = supplier
 
@@ -9,9 +9,9 @@ project(*supplier): messaging, rteventexe {
   }
 }
 
-project(*consumer): messaging, rteventexe {
-  after  += ECMcastTests_Lib CosNaming IORTable
-  libs     += ECMcastTests TAO_CosNaming TAO_IORTable
+project(*consumer): messaging, rteventexe, naming {
+  after  += ECMcastTests_Lib
+  libs     += ECMcastTests
   includes += ../Common
   exename   = consumer
 
@@ -20,9 +20,9 @@ project(*consumer): messaging, rteventexe {
   }
 }
 
-project(*gateway-ec): messaging, rteventexe {
-  after  += ECMcastTests_Lib CosNaming IORTable
-  libs     += ECMcastTests TAO_CosNaming TAO_IORTable
+project(*gateway-ec): messaging, rteventexe, naming {
+  after  += ECMcastTests_Lib
+  libs     += ECMcastTests
   includes += ../Common
   exename   = gateway-ec
 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
index 0f1fd636a2a..ecaba4c37da 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
@@ -1,6 +1,6 @@
-project(*supplier): messaging, rteventexe {
-  after  += ECMcastTests_Lib CosNaming IORTable
-  libs     += ECMcastTests TAO_CosNaming TAO_IORTable
+project(*supplier): messaging, rteventexe, naming {
+  after  += ECMcastTests_Lib
+  libs     += ECMcastTests
   includes += ../Common
   exename   = supplier
 
@@ -9,9 +9,9 @@ project(*supplier): messaging, rteventexe {
   }
 }
 
-project(*consumer): messaging, rteventexe {
-  after  += ECMcastTests_Lib CosNaming IORTable
-  libs     += ECMcastTests TAO_CosNaming TAO_IORTable
+project(*consumer): messaging, rteventexe, naming {
+  after  += ECMcastTests_Lib
+  libs     += ECMcastTests
   includes += ../Common
   exename   = consumer
 
@@ -20,9 +20,9 @@ project(*consumer): messaging, rteventexe {
   }
 }
 
-project(*gateway-ec): messaging, rteventexe {
-  after  += ECMcastTests_Lib CosNaming IORTable
-  libs     += ECMcastTests TAO_CosNaming TAO_IORTable
+project(*gateway-ec): messaging, rteventexe, naming {
+  after  += ECMcastTests_Lib
+  libs     += ECMcastTests
   includes += ../Common
   exename   = gateway-ec
 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
index 15ce9690c3b..bf3969cd93a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
@@ -1,6 +1,6 @@
-project(*application): messaging, rteventexe {
-  after  += ECMcastTests_Lib CosNaming IORTable
-  libs     += ECMcastTests TAO_CosNaming TAO_IORTable
+project(*application): messaging, rteventexe, naming {
+  after  += ECMcastTests_Lib
+  libs     += ECMcastTests
   includes += ../Common
   exename   = application
 
@@ -9,9 +9,9 @@ project(*application): messaging, rteventexe {
   }
 }
 
-project(*gateway-ec): messaging, rteventexe {
-  after  += ECMcastTests_Lib CosNaming IORTable
-  libs     += ECMcastTests TAO_CosNaming TAO_IORTable
+project(*gateway-ec): messaging, rteventexe, naming {
+  after  += ECMcastTests_Lib
+  libs     += ECMcastTests
   includes += ../Common
   exename   = gateway-ec
 
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
index 48e3e3aa096..314db32f27c 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
@@ -1,7 +1,4 @@
-project: orbsvcslib, notify, rtcorba, rtportableserver {
-
-  after    += TAO_NotifyTests
-  libs       += TAO_NotifyTests
+project: orbsvcslib, notify, rtcorba, rtportableserver, notifytest {
 
   sharedname = TAO_RT_NotifyTests
 
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
index f1ee9d20e41..63eb46a1095 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
@@ -1,7 +1,6 @@
 project(*client): taoserver, strategies, dynamicinterface {
   exename   = client
   after    += IDL_Cubit_Server_Exe 
-  libs     += 
   idlflags += -Gd
 
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index 49c6abac707..992b6a429fe 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -1,6 +1,4 @@
-project(* sequence server) : server, strategies {
-  after += DynamicInterface
-  libs    += TAO_DynamicInterface
+project(* sequence server) : server, strategies, dynamicinterface {
   avoids  += minimum_corba
 
   IDL_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 011aad78b25..68030bef440 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -7,10 +7,8 @@ project(* sequence server): server, strategies {
   }
 }
 
-project(* sequence client): server, strategies {
+project(* sequence client): server, strategies, dynamicinterface {
   exename  = client
-  after += DynamicInterface
-  libs    += TAO_DynamicInterface
   avoids  += minimum_corba
 
   Source_Files {
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc
index 1d06b25fc12..1e90cc82b97 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc
@@ -1,6 +1,5 @@
 project : taolib, core {
   sharedname    = TAO_IORInterceptor
-  libs         += TAO
   dynamicflags  = TAO_IORINTERCEPTOR_BUILD_DLL
   include_dir   = tao/IORInterceptor
 }