Mon Feb 22 12:30:38 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
        * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
        * connectors/dds4ccm/impl/ndds/ndds_impl.mpc
        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
        * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc
        * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc
        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
        * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
        * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
        * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
        * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
        * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
        * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
        * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
        * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
        * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
        * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
        * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
        * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
        * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
        * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
          Removed nddslib as base project

        * MPC/config/dds4ccm_base.mpb:
          Added nddslib as base project

71 files changed, 81 insertions, 81 deletions

diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
index 034ff3e22c7..783de99df91 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
@@ -112,7 +112,7 @@ project(DDS_Hello_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_base {
   avoids     += ace_for_tao
   after      +=   DDS_Hello_Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Receiver_exec DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
index 808158c01f1..1afe7ac9bfe 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -113,7 +113,7 @@ project(DDS_Hello_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_base {
   avoids     += ace_for_tao
   after      += DDS_Hello_Base_stub  DDS_Hello_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Hello_Connector_stub DDS_Hello_Connector_svnt  DDS_Hello_Connector_lem_stub
   sharedname  = Sender_svnt
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
index d6f1b5aa469..0d6f96ea9b3 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
@@ -108,7 +108,7 @@ project(DDS_Broker_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Broker_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Broker_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Broker_exec DDS_Quoter_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Broker_svnt
   libs       += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt Broker_exec DDS_Quoter_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
index e69c0d7cd96..a109eb94d00 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
@@ -109,7 +109,7 @@ project(DDS_Distributor_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_Quoter_Base_stub  DDS_Distributor_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt  DDS_Quoter_Connector_lem_stub
   sharedname  = Distributor_svnt
   libs       += Distributor_stub Distributor_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
index 5fe29e9f015..a7e12cec644 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
@@ -108,7 +108,7 @@ project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
index 2057e432c72..acd6b262229 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_Shapes_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_Shapes_Base_stub  DDS_Shapes_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt  DDS_Shapes_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc
index e6f6bad7e38..1edb2b0195d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, nddslib, ccm_stub, ciao_logger {
+project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, ccm_stub, ciao_logger {
 
   after += DDS4CCM_lem_stub
   libs += DDS4CCM_lem_stub
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
index e78f3eec0d7..d22ab815b8d 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
@@ -110,7 +110,7 @@ project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 }
 
 
-project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
+project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel {
   after      += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_exec DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub
   sharedname  = DDS_Perf_Keyed_Test_Connector_svnt
   libs       += DDS_Perf_Keyed_Test_Connector_stub \
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 da08b3d01eb..aac0e747a73 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
@@ -114,7 +114,7 @@ project(DDS_Perf_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Perf_Keyed_Test_Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \
                   DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \
                   DDS_Perf_Keyed_Test_Receiver_exec DDS_PK_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
index 1a241527111..23e43637321 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
@@ -115,7 +115,7 @@ project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base   {
 }
 
 
-project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_Perf_Keyed_Test_Base_stub  DDS_Perf_Keyed_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_Perf_Keyed_Test_Connector_stub \
                 DDS_Perf_Keyed_Test_Connector_svnt DDS_PK_Test_Connector_lem_stub
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
index 3d1cf3b0c6c..f5bb173f14a 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
@@ -110,7 +110,7 @@ project(DDS_Latency_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 }
 
 
-project(DDS_Latency_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
+project(DDS_Latency_Test_Connector_svnt) : ciao_servant, dds4ccm_skel {
   after      += DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Connector_exec DDS_Latency_Test_Connector_stub DDS4CCM_lem_stub
   sharedname  = DDS_Latency_Test_Connector_svnt
   libs       += DDS_Latency_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 d3d87119eaa..f4d139e598c 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
@@ -114,7 +114,7 @@ project(DDS_Latency_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Latency_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Latency_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Latency_Test_Receiver_lem_stub DDS_Latency_Test_Base_stub \
                   DDS_Latency_Test_Connector_stub DDS_Latency_Test_Connector_svnt \
                   DDS_Latency_Test_Receiver_exec DDS_Lat_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc
index 6d5aedb8cea..9a8cd621cf7 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc
@@ -114,7 +114,7 @@ project(DDS_Latency_Test_Sender_exec) : ciao_executor, dds4ccm_base   {
   }
 }
 
-project(DDS_Latency_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Latency_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_Latency_Test_Base_stub  DDS_Latency_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_Latency_Test_Connector_stub \
                 DDS_Latency_Test_Connector_svnt DDS_Lat_Test_Connector_lem_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 9924ed4a847..f02b9c16eb1 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Receiver_exec DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt Receiver_exec DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
index 61318d090ce..f0d4a831f04 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_CSL_DeadlineTest_Base_stub  DDS_CSL_DeadlineTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
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 0b224669db0..306e3857d8b 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_CSL_QoSTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
index 37dfe0fecde..67a350622f4 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_CSL_QoSTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_CSL_QoSTest_Base_stub  DDS_CSL_QoSTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
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 8799cf3e86f..6baeb6ea690 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_CSL_SRTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Receiver_exec DDS_CSL_SRTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt Receiver_exec DDS_CSL_SRTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
index 30adc3ffb7a..b6ae6f6436f 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_CSL_SRTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_CSL_SRTest_Base_stub  DDS_CSL_SRTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
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 1e7f140a816..c274ffb90fd 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_CSL_USTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Receiver_exec DDS_CSL_USTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt Receiver_exec DDS_CSL_USTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
index 20144c4e0ab..751f9e24818 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_CSL_USTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_CSL_USTest_Base_stub  DDS_CSL_USTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
index dc31dc8ca8e..22113269aca 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_DDSWriterEntityReceiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityReceiver_exec DDS_DDSWriterEntityConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt Receiver_exec DDS_DDSWriterEntityConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
index cdfafde74e9..71166f968ba 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
@@ -85,7 +85,7 @@ project(DDS_DDSWriterEntitySender_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_DDSWriterEntitySender_exec) : ciao_executor, nddslib, dds4ccm_base, dds4ccm_impl {
+project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl {
   after += DDS_DDSWriterEntitySender_lem_stub DDS_DDSWriterEntitySender_stub \
            DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \
            DDS4CCM_lem_stub
@@ -115,7 +115,7 @@ project(DDS_DDSWriterEntitySender_exec) : ciao_executor, nddslib, dds4ccm_base,
 }
 
 
-project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_base {
   after += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntitySender_lem_stub \
            DDS4CCM_lem_stub DDS4CCM_skel DDS_DDSWriterEntityConnector_stub \
            DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityConnector_lem_stub
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 9c3d59f3b04..14ebe3fc752 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
@@ -107,7 +107,7 @@ project(DDS_ECT_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_ECT_Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Receiver_exec DDS_ECT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt Receiver_exec DDS_ECT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
index f989d33ef69..ab09308ad2b 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_ECT_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_ECT_Base_stub  DDS_ECT_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_ECT_Connector_stub DDS_ECT_Connector_svnt  DDS_ECT_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
index c9f15186d4a..dc3fb9a5b2f 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
@@ -82,7 +82,7 @@ project(DDS_Get_Invoker_stub) : ccm_stub, dds4ccm_base {
 }
 
 
-project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub \
                   DDS4CCM_lem_stub DDS4CCM_skel DDS_Get_Invoker_idl_gen
   sharedname  = Get_Invoker_svnt
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 204d58414f6..f9ab9a02a3b 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
@@ -118,7 +118,7 @@ project(DDS_Getter_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Base_stub \
                   DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \
                   DDS_Getter_Test_Receiver_exec DDS_Getter_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
index 0fb49fb5349..04db9090105 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
@@ -117,7 +117,7 @@ project(DDS_Getter_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_Getter_Test_Base_stub  DDS_Getter_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_Getter_Test_Connector_stub \
                 DDS_Getter_Test_Connector_svnt DDS_Getter_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
index dff45d07a6a..cc784d6da2a 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
@@ -115,7 +115,7 @@ project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_base, dds4ccm
 }
 
 
-project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_base {
   after += DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleSender_lem_stub \
            DDS4CCM_lem_stub DDS4CCM_skel DDS_InstanceHandleConnector_stub \
            DDS_InstanceHandleConnector_svnt DDS_InstanceHandleConnector_lem_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 f3ee28f4b96..0fad13ece42 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Receiver_exec DDS_Keyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt Receiver_exec DDS_Keyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
index e40e0dca99a..218d2229b8c 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_Keyed_Test_Base_stub  DDS_Keyed_Test_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt  DDS_Keyed_Test_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
index 0ab377d825c..2fc458c4e59 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_KeyedWriterReceiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterReceiver_exec DDS_KeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt Receiver_exec DDS_KeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
index 407519e7c41..bc680654d57 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_KeyedWriterSender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_KeyedWriterBase_stub  DDS_KeyedWriterSender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt  DDS_KeyedWriterConnector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
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 74f1dbaf92a..adffef8a270 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
@@ -114,7 +114,7 @@ project(DDS_LMBM_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Base_stub \
                   DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \
                   DDS_LMBM_Test_Receiver_exec DDS_LMBM_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
index 9837f3dd1fa..6c154cd0a3d 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
@@ -115,7 +115,7 @@ project(DDS_LMBM_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_LMBM_Test_Base_stub  DDS_LMBM_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_LMBM_Test_Connector_stub \
                 DDS_LMBM_Test_Connector_svnt DDS_LMBM_Test_Connector_lem_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 cc0ad916dca..3fa344a1b3a 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
@@ -114,7 +114,7 @@ project(DDS_LNE_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Base_stub \
                   DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \
                   DDS_LNE_Test_Receiver_exec DDS_LNE_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
index 27b38ae0fab..ab8d208ee22 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
@@ -115,7 +115,7 @@ project(DDS_LNE_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_LNE_Test_Base_stub  DDS_LNE_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_LNE_Test_Connector_stub \
                 DDS_LNE_Test_Connector_svnt DDS_LNE_Test_Connector_lem_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 6a4264165ae..5de304650e6 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
@@ -114,7 +114,7 @@ project(DDS_LOBO_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Base_stub \
                   DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \
                   DDS_LOBO_Test_Receiver_exec DDS_LOBO_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
index 173dce00442..e24abd5181c 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
@@ -115,7 +115,7 @@ project(DDS_LOBO_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_LOBO_Test_Base_stub  DDS_LOBO_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_LOBO_Test_Connector_stub \
                 DDS_LOBO_Test_Connector_svnt DDS_LOBO_Test_Connector_lem_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 0b5d77ebebb..c2ca7210b9b 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
@@ -107,7 +107,7 @@ project(DDS_OIT_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_OIT_Test_Receiver_lem_stub DDS_OIT_Test_Base_stub DDS_OIT_Test_Connector_stub DDS_OIT_Test_Connector_svnt DDS_OIT_Test_Receiver_exec DDS_OIT_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS_ConnectorStatusListener_Test_Connector_stub DDS_ConnectorStatusListener_Test_Connector_svnt Receiver_exec DDS_ConnectorStatusListener_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
index 38faf4c8e3e..d32be4f5ad2 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_OIT_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_OIT_Test_Base_stub  DDS_OIT_Test_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_OIT_Test_Connector_stub DDS_OIT_TestSec_Connector_stub DDS_OIT_Test_Connector_svnt  DDS_OIT_TestSec_Connector_svnt DDS_OIT_Test_Connector_lem_stub DDS_OIT_TestSec_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
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 99438c8e4ce..bbdc162021b 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_PSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DeadlineTest_Receiver_exec DDS_PSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt Receiver_exec DDS_PSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
index 5492dc5d2ab..011f7599b8b 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_PSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_PSL_DeadlineTest_Base_stub  DDS_PSL_DeadlineTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
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 20a91079042..7cca478519d 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_PSL_SampleLost_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SampleLost_Receiver_exec DDS_PSL_SL_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt Receiver_exec DDS_PSL_SL_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
index 1bac1d3a776..2c0dda9fb62 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_PSL_SampleLost_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_PSL_SampleLost_Base_stub  DDS_PSL_SampleLost_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
index 28b5497db91..27fb912dfd1 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
@@ -2,7 +2,7 @@
 
 project(DDS_QueryFilter_Starter_idl_gen) : componentidldefaults {
   custom_only = 1
-  after += 
+  after +=
   idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
               -Wb,stub_export_include=QueryFilter_Starter_stub_export.h \
               -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
@@ -57,7 +57,7 @@ project(DDS_QueryFilter_Starter_lem_stub) : ccm_svnt, dds4ccm_base  {
 
 project(DDS_QueryFilter_Starter_stub) : ccm_stub, dds4ccm_base {
   after += DDS_QueryFilter_Starter_idl_gen
-  libs  += 
+  libs  +=
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -82,7 +82,7 @@ project(DDS_QueryFilter_Starter_stub) : ccm_stub, dds4ccm_base {
 }
 
 
-project(DDS_QueryFilter_Starter_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_QueryFilter_Starter_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_QueryFilter_Starter_lem_stub DDS_QueryFilter_Starter_stub\
                   DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = QueryFilter_Starter_svnt
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 93b94220a17..a0271f308ba 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
@@ -118,7 +118,7 @@ project(QueryFilter_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(QueryFilter_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(QueryFilter_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   QueryFilter_Test_Receiver_lem_stub QueryFilter_Test_Base_stub \
                   QueryFilter_Test_Connector_stub QueryFilter_Test_Connector_svnt \
                   QueryFilter_Test_Receiver_exec QueryFilter_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
index db521cac19a..f52071d3fd4 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
@@ -118,7 +118,7 @@ project(QueryFilter_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(QueryFilter_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(QueryFilter_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += QueryFilter_Test_Base_stub  QueryFilter_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel QueryFilter_Test_Connector_stub \
                 QueryFilter_Test_Connector_svnt QueryFilter_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
index 04559f02c42..8ae5f2df6e4 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
@@ -2,7 +2,7 @@
 
 project(DDS_Reader_Starter_idl_gen) : componentidldefaults {
   custom_only = 1
-  after += 
+  after +=
   idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
               -Wb,stub_export_include=Reader_Starter_stub_export.h \
               -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
@@ -57,7 +57,7 @@ project(DDS_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base  {
 
 project(DDS_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
   after += DDS_Reader_Starter_idl_gen
-  libs  += 
+  libs  +=
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -82,7 +82,7 @@ project(DDS_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
 }
 
 
-project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub\
                   DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Reader_Starter_svnt
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 e5a9b873ec8..6abb390494a 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
@@ -118,7 +118,7 @@ project(DDS_Reader_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Base_stub \
                   DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \
                   DDS_Reader_Test_Receiver_exec DDS_Reader_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
index cf787193a97..8d83f79fe8c 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
@@ -117,7 +117,7 @@ project(DDS_Reader_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_Reader_Test_Base_stub  DDS_Reader_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_Reader_Test_Connector_stub \
                 DDS_Reader_Test_Connector_svnt DDS_Reader_Test_Connector_lem_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 1b60ea7f442..ad16ea7629a 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_SL_Disabled_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_Disabled_Receiver_exec DDS_SL_OC_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt Receiver_exec DDS_SL_OC_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
index 6a3ce5fc359..3e8f3c72a96 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_SL_Disabled_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_SL_Disabled_Base_stub  DDS_SL_Disabled_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
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 ab57fdd0a70..8bfdfa70bcb 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_SL_ManyByMany_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_ManyByMany_Receiver_exec DDS_SL_MBM_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt Receiver_exec DDS_SL_MBM_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
index a45e20fb4a9..89844656a39 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_SL_ManyByMany_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_SL_ManyByMany_Base_stub  DDS_SL_ManyByMany_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
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 6204a41230c..36c68fe47da 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_SL_OneByOne_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OneByOne_Receiver_exec DDS_SL_OBO_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt Receiver_exec DDS_SL_OBO_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
index 783a2d3cea6..964d387b122 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_SL_OneByOne_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_SL_OneByOne_Base_stub  DDS_SL_OneByOne_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
index c7302b0998c..dd10b3c00ad 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
@@ -86,7 +86,7 @@ project(DDS_SharedDP_DDComponent_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_SharedDP_DDComponent_exec) : ciao_executor, nddslib, dds4ccm_base, dds4ccm_impl {
+project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl {
   after   += DDS_SharedDP_DDComponent_lem_stub DDS_SharedDP_DDComponent_stub \
              DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub \
              DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub \
@@ -120,7 +120,7 @@ project(DDS_SharedDP_DDComponent_exec) : ciao_executor, nddslib, dds4ccm_base, d
 }
 
 
-project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_SharedDP_DDBase_stub  DDS_SharedDP_DDComponent_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel \
                 DDS_SharedDP_Connector1_stub DDS_SharedDP_Connector1_svnt  DDS_SharedDP_Connector1_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
index 195876d6eef..de0dc70d02b 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
@@ -84,7 +84,7 @@ project(DDS_SharedDPComponent_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_SharedDPComponent_exec) : ciao_executor, nddslib, dds4ccm_base, dds4ccm_impl {
+project(DDS_SharedDPComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl {
   after   += DDS_SharedDPComponent_lem_stub DDS_SharedDPComponent_stub \
              DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub \
              DDS4CCM_lem_stub
@@ -114,7 +114,7 @@ project(DDS_SharedDPComponent_exec) : ciao_executor, nddslib, dds4ccm_base, dds4
 }
 
 
-project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_SharedDPBase_stub  DDS_SharedDPComponent_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel \
                 DDS_SharedDP_Connector_stub DDS_SharedDP_Connector_svnt \
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 b56f86f819b..348489dc248 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
@@ -107,7 +107,7 @@ project(DDS_SCT_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_SCT_Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Receiver_exec DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt Receiver_exec DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
index 0be09735985..bff93b3d731 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_SCT_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_SCT_Base_stub  DDS_SCT_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SCT_Connector_stub DDS_SCT_Connector_svnt  DDS_SCT_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
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 31ed67921a2..e96f5cbc5a1 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_Unkeyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
index 54725ed48ff..366f9895295 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_Unkeyed_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_Unkeyed_Test_Base_stub  DDS_Unkeyed_Test_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt  DDS_Unkeyed_Test_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
index 044252195eb..20b80aae24a 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_UnkeyedWriterReceiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterReceiver_exec DDS_UnkeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt Receiver_exec DDS_UnkeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
index 394e0de58e4..8091fc75b2d 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_UnkeyedWriterSender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_UnkeyedWriterBase_stub  DDS_UnkeyedWriterSender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt  DDS_UnkeyedWriterConnector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
index 9e092ef2551..ae6245eb9b8 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
@@ -107,7 +107,7 @@ project(DDS_Updater_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_UPDATER_Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_Updater_Receiver_exec DDS_UPDATER_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt Receiver_exec DDS_UPDATER_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
index c4ca357c402..741da23e378 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_Updater_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_Updater_Base_stub  DDS_Updater_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
index 9e931317015..6753d378972 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
@@ -108,7 +108,7 @@ project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_base   {
 }
 
 
-project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_VTopic_Base_stub  DDS_VTopic_Receiver_lem_stub DDS4CCM_lem_stub \
                 DDS4CCM_skel DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub  DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub \
                 DDS_VTopic_Connector_svnt DDS_VT_Array_Connector_svnt DDS_VT_String_Connector_svnt DDS_VT_Seq_Connector_svnt \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
index e1709ea22a7..71bcd8be17d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
@@ -109,7 +109,7 @@ project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_base   {
 }
 
 
-project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_VTopic_Base_stub  DDS_VTopic_Sender_lem_stub DDS4CCM_lem_stub \
                 DDS4CCM_skel DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub  DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub \
                 DDS_VTopic_Connector_svnt DDS_VT_Array_Connector_svnt DDS_VT_String_Connector_svnt DDS_VT_Seq_Connector_svnt \
@@ -126,7 +126,7 @@ project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
                 DDS_VTopic_Connector_svnt \
                 DDS_VT_Array_Connector_svnt \
                 DDS_VT_String_Connector_svnt \
-                DDS_VT_Seq_Connector_svnt 
+                DDS_VT_Seq_Connector_svnt
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
index 0eca38fb34d..d29787c357d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
@@ -2,7 +2,7 @@
 
 project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
-  after += DDS_VTopics_Connector_idl_gen 
+  after += DDS_VTopics_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=RECEIVER_SVNT_Export \
@@ -107,7 +107,7 @@ project(DDS_VTopics_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_base {
   after      +=   DDS_VTopics_Receiver_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt  DDS_VTS_Seq_Connector_svnt  DDS_VTopics_Receiver_exec DDS_VTopics_Connector_lem_stub DDS_VTS_String_Connector_lem_stub DDS_VTS_Array_Connector_lem_stub DDS_VTS_Seq_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
index 9decdfd3a53..f730be4ac52 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
 project(DDS_VTopics_Sender_idl_gen) : componentidldefaults   {
-  after += DDS_VTopics_Connector_idl_gen 
+  after += DDS_VTopics_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
@@ -109,7 +109,7 @@ project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_base   {
 }
 
 
-project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_base {
   after      += DDS_VTopics_Base_stub  DDS_VTopics_Sender_lem_stub DDS4CCM_lem_stub \
                 DDS4CCM_skel DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
                 DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt DDS_VTS_Seq_Connector_svnt \