Thu Mar 18 09:42:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

	* connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
	* connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
	* connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
	* connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
	* connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
	* connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
	* connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc
	* connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp
	* connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc
	* connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
	* connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
	* connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
	* connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
	* connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
	* connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
	* connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
	* connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
	* connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
	* connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
	* connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
	* connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
	* connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
	* connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
	* connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
	* connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
	* connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
	* connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
	* connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
	* connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
	* connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
	* connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
	* connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
	* connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
	* connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
	* connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
	* connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
	* connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
	* connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
	* connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
	* connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
	* connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
	* connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
	  Layout fixes 

42 files changed, 53 insertions, 53 deletions

diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
index f7ece384890..fe3d57a35f8 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
@@ -19,7 +19,7 @@ project(Large_Connector_idl_gen) : connectoridldefaults , dds4ccm  {
   }
 }
 
-project(Large_Connector_lem_gen) : ciaoidldefaults, dds4ccm_base  {
+project(Large_Connector_lem_gen) : ciaoidldefaults, dds4ccm_base {
   after += Large_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LARGE_CONNECTOR_LEM_STUB_Export \
@@ -31,7 +31,7 @@ project(Large_Connector_lem_gen) : ciaoidldefaults, dds4ccm_base  {
   }
 }
 
-project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
   after += Large_Connector_lem_gen Large_Connector_stub_stub Large_Deployment_stub
   libs  +=  Large_Connector_stub Large_Deployment_stub DDS4CCM_lem_stub
   libpaths += ../lib
@@ -57,7 +57,7 @@ project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_base  {
   }
 }
 
-project(Large_Connector_stub) : ccm_stub, dds4ccm_base  {
+project(Large_Connector_stub) : ccm_stub, dds4ccm_base {
   after += Large_Connector_idl_gen Large_Deployment_stub
   libs  += Large_Deployment_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
index 59ede26a448..25eb402c813 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
@@ -28,7 +28,7 @@ project(Large_DDS_Pub_lem_gen) : ciaoidldefaults , dds4ccm  {
   }
 }
 
-project(Large_DDS_Pub_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(Large_DDS_Pub_lem_stub) : ccm_svnt, dds4ccm_base {
   after += Large_DDS_Pub_lem_gen Large_DDS_Pub_stub  Large_Deployment_stub
   libs  +=  DDS_Pub_stub Large_Deployment_stub
   libpaths += ../lib
@@ -54,7 +54,7 @@ project(Large_DDS_Pub_lem_stub) : ccm_svnt, dds4ccm_base  {
   }
 }
 
-project(Large_DDS_Pub_stub) : ccm_stub, dds4ccm_base  {
+project(Large_DDS_Pub_stub) : ccm_stub, dds4ccm_base {
   after += Large_DDS_Pub_idl_gen Large_Deployment_stub
   libs  += Large_Deployment_stub
   libpaths += ../lib
@@ -80,7 +80,7 @@ project(Large_DDS_Pub_stub) : ccm_stub, dds4ccm_base  {
   }
 }
 
-project(Large_DDS_Pub_exec) : ciao_executor, dds4ccm_base  {
+project(Large_DDS_Pub_exec) : ciao_executor, dds4ccm_base {
   after   += Large_DDS_Pub_lem_stub Large_DDS_Pub_stub Large_Connector_stub
   sharedname = DDS_Pub_exec
   libs += DDS_Pub_stub DDS_Pub_lem_stub Large_Deployment_stub Large_Connector_stub
@@ -106,7 +106,7 @@ project(Large_DDS_Pub_exec) : ciao_executor, dds4ccm_base  {
 }
 
 
-project(Large_DDS_Pub_svnt) : ciao_servant, dds4ccm_base  {
+project(Large_DDS_Pub_svnt) : ciao_servant, dds4ccm_base {
   after      +=   Large_DDS_Pub_lem_stub Large_Connector_stub
   sharedname  = DDS_Pub_svnt
   libs       += DDS_Pub_stub DDS_Pub_lem_stub  Large_Deployment_stub
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
index 4894d08eeff..58daf5bda10 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
@@ -28,7 +28,7 @@ project(Large_DDS_Sub_lem_gen) : ciaoidldefaults , dds4ccm  {
   }
 }
 
-project(Large_DDS_Sub_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(Large_DDS_Sub_lem_stub) : ccm_svnt, dds4ccm_base {
   after += Large_DDS_Sub_lem_gen Large_DDS_Sub_stub Large_Deployment_stub
   libs  +=  DDS_Sub_stub Large_Deployment_stub
   libpaths += ../lib
@@ -54,7 +54,7 @@ project(Large_DDS_Sub_lem_stub) : ccm_svnt, dds4ccm_base  {
   }
 }
 
-project(Large_DDS_Sub_stub) : ccm_stub, dds4ccm_base  {
+project(Large_DDS_Sub_stub) : ccm_stub, dds4ccm_base {
   after += Large_DDS_Sub_idl_gen Large_Deployment_stub
   libs  += Large_Deployment_stub
   libpaths += ../lib
@@ -80,10 +80,10 @@ project(Large_DDS_Sub_stub) : ccm_stub, dds4ccm_base  {
   }
 }
 
-project(Large_DDS_Sub_exec) : ciao_executor, dds4ccm_base  {
-  after   += Large_DDS_Sub_lem_stub Large_DDS_Sub_stub Large_Connector_stub
+project(Large_DDS_Sub_exec) : ciao_executor, dds4ccm_base {
+  after   += Large_DDS_Sub_lem_stub Large_DDS_Sub_stub Large_Connector_stub DDS4CCM_lem_stub Large_Connector_lem_stub
   sharedname = DDS_Sub_exec
-  libs += DDS_Sub_stub DDS_Sub_lem_stub Large_Deployment_stub Large_Connector_stub
+  libs += DDS_Sub_stub DDS_Sub_lem_stub Large_Deployment_stub Large_Connector_stub DDS4CCM_lem_stub Large_Connector_lem_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -106,7 +106,7 @@ project(Large_DDS_Sub_exec) : ciao_executor, dds4ccm_base  {
 }
 
 
-project(Large_DDS_Sub_svnt) : ciao_servant, dds4ccm_base  {
+project(Large_DDS_Sub_svnt) : ciao_servant, dds4ccm_base {
   after      +=   Large_DDS_Sub_lem_stub Large_Connector_stub
   sharedname  = DDS_Sub_svnt
   libs       += DDS_Sub_stub DDS_Sub_lem_stub  Large_Deployment_stub Large_Connector_stub
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
index 53f355f5d7e..b51d8a49482 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
@@ -30,7 +30,7 @@ project(DDS_Broker_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Broker_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Broker_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Broker_lem_gen DDS_Broker_stub  DDS_Quoter_Connector_stub DDS_Quoter_Base_stub
   libs  +=  Broker_stub DDS_Quoter_Connector_stub DDS_Quoter_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
index cb97f698b46..083de706195 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
@@ -30,7 +30,7 @@ project(DDS_Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Shapes_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Shapes_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Shapes_Receiver_lem_gen DDS_Shapes_Receiver_stub  DDS_Shapes_Connector_stub DDS_Shapes_Base_stub
   libs  +=  Receiver_stub DDS_Shapes_Connector_stub DDS_Shapes_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
index 70f081b32d5..e5b0379d8da 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_Perf_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Perf_Keyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Perf_Keyed_Test_Receiver_lem_gen DDS_Perf_Keyed_Test_Receiver_stub  \
            DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub
   libs  +=  Receiver_stub DDS_Perf_Keyed_Test_Connector_stub \
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc
index e6a9d688078..d66239f3d91 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_Latency_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Latency_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Latency_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Latency_Test_Receiver_lem_gen DDS_Latency_Test_Receiver_stub  \
            DDS_Latency_Test_Connector_stub DDS_Latency_Test_Base_stub
   libs  +=  Receiver_stub DDS_Latency_Test_Connector_stub \
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp
index 32cc45b9953..4722e431cd6 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp
@@ -101,13 +101,13 @@ namespace CIAO_Latency_Test_Sender_Impl
     if((!CORBA::is_nil(the_entity)) &&
        (kind==DDS::PUBLICATION_MATCHED_STATUS))
       {
-        ::DDS::PublicationMatchedStatus_var stat;
         DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow(the_entity);
         if(CORBA::is_nil(wr))
          {
             throw ::CORBA::INTERNAL ();
          }
-        ::DDS::ReturnCode_t retval = wr->get_publication_matched_status(stat.out ());
+        ::DDS::PublicationMatchedStatus_var stat;
+        ::DDS::ReturnCode_t const retval = wr->get_publication_matched_status(stat.out ());
         if (retval == DDS::RETCODE_OK)
           {
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc
index bdb53f48aa1..bb337d8a3ec 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_LatencyTT_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LatencyTT_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_LatencyTT_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_LatencyTT_Test_Receiver_lem_gen DDS_LatencyTT_Test_Receiver_stub  \
            DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_TestSec_Connector_stub DDS_LatencyTT_Test_Base_stub
   libs  +=  Receiver_stub DDS_LatencyTT_Test_Connector_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
index d617b0cbbaf..f071c196131 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_CSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_CSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_CSL_DeadlineTest_Receiver_lem_gen DDS_CSL_DeadlineTest_Receiver_stub  DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
   libs  +=  Receiver_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
index ac0db3b58d2..abf97c993e8 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_CSL_QoSTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_QoSTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_CSL_QoSTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_CSL_QoSTest_Receiver_lem_gen DDS_CSL_QoSTest_Receiver_stub  DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
   libs  +=  Receiver_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
index 3331208340b..3481260f7d7 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_CSL_SRTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_SRTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_CSL_SRTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_CSL_SRTest_Receiver_lem_gen DDS_CSL_SRTest_Receiver_stub  DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
   libs  +=  Receiver_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
index 275fd4533b3..8071b999aa2 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_CSL_USTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_USTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_CSL_USTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_CSL_USTest_Receiver_lem_gen DDS_CSL_USTest_Receiver_stub  DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
   libs  +=  Receiver_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
index 69db9381c5e..ba32ea8ba26 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
@@ -28,7 +28,7 @@ project(DDS_Coh_Update_ReaderStarter_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Coh_Update_ReaderStarter_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Coh_Update_ReaderStarter_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Coh_Update_ReaderStarter_lem_gen DDS_Coh_Update_ReaderStarter_stub
   libs  += Reader_Starter_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
index b815039fd03..864d8a6e6e2 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(CoherentUpdate_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(CoherentUpdate_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(CoherentUpdate_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += CoherentUpdate_Test_Receiver_lem_gen CoherentUpdate_Test_Receiver_stub  \
            CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub \
            DDS_Coh_Update_ReaderStarter_stub
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
index 7ba671f97d8..325e84a8554 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
@@ -28,7 +28,7 @@ project(DDS_Coherent_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Coherent_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Coherent_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Coherent_Reader_Starter_lem_gen DDS_Coherent_Reader_Starter_stub
   libs  += Reader_Starter_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
index f5870a7e346..f4b55360304 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(CoherentWrite_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(CoherentWrite_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(CoherentWrite_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += CoherentWrite_Test_Receiver_lem_gen CoherentWrite_Test_Receiver_stub  \
            CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub \
            DDS_Coherent_Reader_Starter_stub
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
index 3645300c105..36cbc7c960a 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_DDSWriterEntityReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_DDSWriterEntityReceiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_DDSWriterEntityReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_DDSWriterEntityReceiver_lem_gen DDS_DDSWriterEntityReceiver_stub  DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
   libs  +=  Receiver_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
index 977e32bfc7c..cf4b41fa0e0 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_ECT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_ECT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_ECT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_ECT_Receiver_lem_gen DDS_ECT_Receiver_stub  DDS_ECT_Connector_stub DDS_ECT_Base_stub
   libs  +=  Receiver_stub DDS_ECT_Connector_stub DDS_ECT_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
index cc14ce7be8f..41f85b50ae1 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
@@ -29,7 +29,7 @@ project(DDS_Get_Invoker_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Get_Invoker_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Get_Invoker_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Get_Invoker_lem_gen DDS_Get_Invoker_stub
   libs  += Get_Invoker_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
index 3bc6e99c9eb..a6751e40f22 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_Getter_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Getter_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Getter_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Getter_Test_Receiver_lem_gen DDS_Getter_Test_Receiver_stub  \
            DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub \
            DDS_Get_Invoker_stub
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
index 1784d080aa7..39b660fe6db 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Keyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Keyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Keyed_Test_Receiver_lem_gen DDS_Keyed_Test_Receiver_stub  DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
   libs  +=  Receiver_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
index 4c41207a86c..e26c2300be0 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_KeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_KeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_KeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_KeyedWriterReceiver_lem_gen DDS_KeyedWriterReceiver_stub  DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
   libs  +=  Receiver_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
index 3cf42501a32..525a82ca292 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_LMBM_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LMBM_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_LMBM_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_LMBM_Test_Receiver_lem_gen DDS_LMBM_Test_Receiver_stub  \
            DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
   libs  +=  Receiver_stub DDS_LMBM_Test_Connector_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
index 470e858a7d9..7cdc3ba7d08 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_LNE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LNE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_LNE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_LNE_Test_Receiver_lem_gen DDS_LNE_Test_Receiver_stub  \
            DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
   libs  +=  Receiver_stub DDS_LNE_Test_Connector_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
index 3fd08622f06..e0c085aa363 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_LOBO_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LOBO_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_LOBO_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_LOBO_Test_Receiver_lem_gen DDS_LOBO_Test_Receiver_stub  \
            DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
   libs  +=  Receiver_stub DDS_LOBO_Test_Connector_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
index 4e08d54a005..a655914692e 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
@@ -52,7 +52,7 @@ project(NoModule_Connector_lem_stub) : ccm_svnt , dds4ccm_lem_stub  {
   }
 }
 
-project(NoModule_Connector_stub) : ccm_stub, dds4ccm_base  {
+project(NoModule_Connector_stub) : ccm_stub, dds4ccm_base {
   after += NoModule_Connector_idl_gen NoModule_stub
   libs  += NoModule_stub
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
index aa1d2e46dac..644200c6e81 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_OIT_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_OIT_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_OIT_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_OIT_Test_Receiver_lem_gen DDS_OIT_Test_Receiver_stub  DDS_OIT_Test_Connector_stub DDS_OIT_Test_Base_stub
   libs  +=  Receiver_stub DDS_ConnectorStatusListener_Test_Connector_stub DDS_ConnectorStatusListener_Test_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
index a0555d8bef9..d29641cbb5b 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_PSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_PSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_PSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_PSL_DeadlineTest_Receiver_lem_gen DDS_PSL_DeadlineTest_Receiver_stub  DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
   libs  +=  Receiver_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
index b0d5445c89a..b4ab3eaecfd 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_PSL_SampleLost_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_PSL_SL_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_PSL_SL_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_PSL_SampleLost_Receiver_lem_gen DDS_PSL_SampleLost_Receiver_stub  DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
   libs  +=  Receiver_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
index adca4b6f90f..1dacde89666 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
@@ -28,7 +28,7 @@ project(DDS_QueryFilter_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_QueryFilter_Starter_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_QueryFilter_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_QueryFilter_Starter_lem_gen DDS_QueryFilter_Starter_stub
   libs  += QueryFilter_Starter_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
index 08a37a3729c..9b80fe796a4 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(QueryFilter_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(QueryFilter_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(QueryFilter_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += QueryFilter_Test_Receiver_lem_gen QueryFilter_Test_Receiver_stub  \
            QueryFilter_Test_Connector_stub QueryFilter_Test_Base_stub \
            DDS_QueryFilter_Starter_stub
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
index 07ac012bf4f..e5e5ef8ea8e 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
@@ -29,7 +29,7 @@ project(DDS_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Reader_Starter_lem_gen DDS_Reader_Starter_stub
   libs  += Reader_Starter_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
index d089841d4dd..a6a1aec6c05 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_Reader_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Reader_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Reader_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Reader_Test_Receiver_lem_gen DDS_Reader_Test_Receiver_stub  \
            DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub \
            DDS_Reader_Starter_stub
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
index a3cae392d76..e6da1488efa 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_SL_Disabled_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_OC_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_SL_OC_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_SL_Disabled_Receiver_lem_gen DDS_SL_Disabled_Receiver_stub  DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
   libs  +=  Receiver_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
index 116d76ed1df..88db59ce7dd 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_SL_ManyByMany_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_MBM_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_SL_MBM_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_SL_ManyByMany_Receiver_lem_gen DDS_SL_ManyByMany_Receiver_stub  DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
   libs  +=  Receiver_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
index e8e2edad607..4ff2ea80094 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_SL_OneByOne_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_OBO_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_SL_OBO_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_SL_OneByOne_Receiver_lem_gen DDS_SL_OneByOne_Receiver_stub  DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
   libs  +=  Receiver_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
index bedaeac439f..2d627ca41ee 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_SCT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SCT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_SCT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_SCT_Receiver_lem_gen DDS_SCT_Receiver_stub  DDS_SCT_Connector_stub DDS_SCT_Base_stub
   libs  +=  Receiver_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
index dbfac305cbf..3828155ff07 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_Unkeyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Unkeyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_Unkeyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Unkeyed_Test_Receiver_lem_gen DDS_Unkeyed_Test_Receiver_stub  DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub
   libs  +=  Receiver_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
index 27862554d8d..8a3f6f0f12f 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_UnkeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_UnkeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_UnkeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_UnkeyedWriterReceiver_lem_gen DDS_UnkeyedWriterReceiver_stub  DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub
   libs  +=  Receiver_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
index 7ce29bcf3db..0a1c0c1ae8b 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_Updater_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_UPDATER_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_UPDATER_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Updater_Receiver_lem_gen DDS_Updater_Receiver_stub  DDS_Updater_Connector_stub DDS_Updater_Base_stub
   libs  +=  Receiver_stub DDS_Updater_Connector_stub DDS_Updater_Base_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
index 27175e48b34..e4e4bdf788f 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
@@ -29,7 +29,7 @@ project(DDS_VTopics_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopics_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_VTopics_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_VTopics_Receiver_lem_gen DDS_VTopics_Receiver_stub DDS_VTopics_Base_stub \
            DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
            DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \