merged 94966 again

23 files changed, 26 insertions, 40 deletions

diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH
index fd9256ef5b1..67ae64008f3 100644
--- a/TAO/ChangeLog.BRANCH
+++ b/TAO/ChangeLog.BRANCH
@@ -1,3 +1,29 @@
+Fri Nov  4 15:45:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/AMI/FL_Callback/FL_Callback.mpc:
+        * examples/RTScheduling/Job.mpc:
+        * examples/RTScheduling/Synch.mpc:
+        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+        * orbsvcs/orbsvcs/CosEvent.mpc:
+        * orbsvcs/orbsvcs/CosLifeCycle.mpc:
+        * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+        * orbsvcs/orbsvcs/CosProperty.mpc:
+        * orbsvcs/orbsvcs/CosTime.mpc:
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
+        * orbsvcs/orbsvcs/ec_typed_events_skel.mpb:
+        * tao/IFR_Client/IFR_Client.mpc:
+        * tests/Alt_Mapping/alt_mapping.mpc:
+        * tests/IDL_Inherited_Operation/InheritedOp.mpc:
+        * tests/Monitor/Marshal_Buffer/marshal_buffer.mpc:
+        * tests/Param_Test/Param_Test.mpc:
+          Removed all S.inl entries from the MPC files
+
 Fri Nov  4 16:17:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * TAO_IDL/tao_idl.1:
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index b92be693ead..26dfc3111de 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -28,7 +28,6 @@ project(*progress): taoexe, messaging, ami, portableserver, tao_flresource {
   
   Inline_Files {
     testC.inl
-    testS.inl
   }
   
   IDL_Files {
@@ -54,7 +53,6 @@ project(*peer): taoexe, strategies, messaging, ami, portableserver {
   
   Inline_Files {
     testC.inl
-    testS.inl
   }
   
   IDL_Files {
diff --git a/TAO/examples/RTScheduling/Job.mpc b/TAO/examples/RTScheduling/Job.mpc
index 103df7d95ce..8e46c315901 100644
--- a/TAO/examples/RTScheduling/Job.mpc
+++ b/TAO/examples/RTScheduling/Job.mpc
@@ -26,6 +26,5 @@ project(Job): portableserver {
 
   Inline_Files {
     JobC.inl
-    JobS.inl
   }
 }
diff --git a/TAO/examples/RTScheduling/Synch.mpc b/TAO/examples/RTScheduling/Synch.mpc
index 23920a77023..77a2ae1d681 100644
--- a/TAO/examples/RTScheduling/Synch.mpc
+++ b/TAO/examples/RTScheduling/Synch.mpc
@@ -27,6 +27,5 @@ project(RTSchedSynch): portableserver {
 
   Inline_Files {
     SynchC.inl
-    SynchS.inl
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 8c1cce3a75e..f22d6d23160 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -63,7 +63,6 @@ project(CosConcurrency_Skel): orbsvcslib, orbsvcs_output, install, concurrency,
   }
 
   Inline_Files {
-    CosConcurrencyControlS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index af96ca992fe..80efa635a0a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -71,8 +71,6 @@ project (CosEvent_Skel) : orbsvcslib, orbsvcs_output, install, avoids_minimum_co
   }
 
   Inline_Files {
-    CosEventCommS.inl
-    CosEventChannelAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index debd95904d2..1820a1ecc27 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -67,8 +67,6 @@ project(CosLifeCycle_Skel) : orbsvcslib, orbsvcs_output, install, lifecycle, por
   }
 
   Inline_Files {
-    CosLifeCycleS.inl
-    LifeCycleServiceS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
index 30a30181bac..f7b411099d9 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
@@ -19,7 +19,6 @@ project(CosNaming_Skel) : orbsvcslib, orbsvcs_output, install, naming, portables
   }
 
   Inline_Files {
-    CosNamingS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 74027108963..142088974dd 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -95,12 +95,6 @@ project(CosNotification_Skel) : orbsvcslib, orbsvcs_output, install, notificatio
   }
 
   Inline_Files {
-    CosNotificationS.inl
-    CosNotifyCommS.inl
-    CosNotifyFilterS.inl
-    CosNotifyChannelAdminS.inl
-    NotifyExtS.inl
-    Event_ForwarderS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index feabcd709f0..1a6d99258fe 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -62,7 +62,6 @@ project(CosProperty_Skel) : orbsvcslib, orbsvcs_output, install, property, porta
   }
 
   Inline_Files {
-    CosPropertyS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index 803b03e131f..712e71e15f2 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -61,7 +61,6 @@ project(CosTime_Skel) : orbsvcslib, orbsvcs_output, install, time, portableserve
   }
 
   Inline_Files {
-    TimeServiceS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 870470e0a30..bd69cd8d01d 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -77,9 +77,6 @@ project(CosTrading_Skel) : orbsvcslib, orbsvcs_output, install, trading, portabl
   }
 
   Inline_Files {
-    CosTradingS.inl
-    CosTradingReposS.inl
-    CosTradingDynamicS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 7b0769e0dd6..657348872be 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -63,7 +63,6 @@ project(DsEventLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dseventloga
   }
 
   Inline_Files {
-    DsEventLogAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index aeaa96fab09..8e21e951446 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -70,8 +70,6 @@ project(DsLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dslogadmin, port
   }
 
   Inline_Files {
-    DsLogAdminS.inl
-    DsLogNotificationS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index 03174af7e38..940016b3e03 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -64,7 +64,6 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dsnotifylo
   }
 
   Inline_Files {
-    DsNotifyLogAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index ac0f8b9fbb3..5ccb28ebc3b 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -62,7 +62,6 @@ project(RTEventLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, rteventloga
   }
 
   Inline_Files {
-    RTEventLogAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
index e2fa2a25037..e9f5730760b 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -29,10 +29,6 @@ project(RTEvent_Skel) : orbsvcslib, orbsvcs_output, install, rtevent, portablese
   }
 
   Inline_Files {
-    RtecDefaultEventDataS.inl
-    RtecEventCommS.inl
-    RtecEventChannelAdminS.inl
-    RtecUDPAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
index b5316d32dab..5eec5e72e58 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
@@ -18,8 +18,6 @@ feature(ec_typed_events) {
   }
 
   Inline_Files {
-    CosTypedEventCommS.inl
-    CosTypedEventChannelAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc
index 1d50a825948..84c7d98cf6e 100644
--- a/TAO/tao/IFR_Client/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client/IFR_Client.mpc
@@ -83,10 +83,6 @@ project(IFR_Client_skel) : ifr_client, taolib, tao_output, install, anytypecode,
   }
 
   Inline_Files {
-    IFR_BaseS.inl
-    IFR_BasicS.inl
-    IFR_ComponentsS.inl
-    IFR_ExtendedS.inl
   }
 
   specific {
diff --git a/TAO/tests/Alt_Mapping/alt_mapping.mpc b/TAO/tests/Alt_Mapping/alt_mapping.mpc
index 302f66953ee..44dd5ab336a 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping.mpc
+++ b/TAO/tests/Alt_Mapping/alt_mapping.mpc
@@ -30,7 +30,6 @@ project(*Server): taoserver, codeset, avoids_minimum_corba, avoids_corba_e_compa
   }
   
   Inline_Files {
-    alt_mappingS.inl
     alt_mappingC.inl
   }
 }
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
index ab64f74834c..40f1c93b523 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver {
   
   Inline_Files {
     InheritedOpC.inl
-    InheritedOpS.inl
   }
 
   IDL_Files {
diff --git a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
index c96fdb5f6f3..200b4ec6fa6 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
+++ b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
@@ -50,7 +50,6 @@ project(*server): taoserver {
 
   Inline_Files {
     testC.inl
-    testS.inl
   }
 }
 
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 97a74931b30..0b887ef7890 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver, codeset, avoids_minimum_corba, avoids_corba_e_compa
   }
 
   Inline_Files {
-    param_testS.inl
     param_testC.inl
   }