Tue Feb 23 07:22:49 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

* connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc * 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/Connector/Quoter_Connector.mpc * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc * connectors/dds4ccm/idl/dds4ccm.mpc * connectors/dds4ccm/idl/dds_rtf2_dcps.idl * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h * connectors/dds4ccm/impl/ndds/DataReader.h * connectors/dds4ccm/impl/ndds/DataReaderListener.h * connectors/dds4ccm/impl/ndds/DataWriter.h * connectors/dds4ccm/impl/ndds/DataWriterListener.h * connectors/dds4ccm/impl/ndds/DomainParticipant.h * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h * connectors/dds4ccm/impl/ndds/Publisher.h * connectors/dds4ccm/impl/ndds/PublisherListener.h * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h * connectors/dds4ccm/impl/ndds/QueryCondition.h * connectors/dds4ccm/impl/ndds/ReadCondition.h * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h * connectors/dds4ccm/impl/ndds/StatusCondition.h * connectors/dds4ccm/impl/ndds/Subscriber.h * connectors/dds4ccm/impl/ndds/SubscriberListener.h * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h * connectors/dds4ccm/impl/ndds/TopicDescription.h * connectors/dds4ccm/impl/ndds/TopicListener.h * connectors/dds4ccm/impl/ndds/Utils.h * 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/Connector/CSL_DeadlineTest_Connector.mpc * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.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/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.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/Connector/QueryFilter_Test_Connector.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/Connector/Reader_Test_Connector.mpc * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.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/Connector/State_Connection_Test_Connector.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/TwoTopics/Connector/TwoTopics_Connector.mpc * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc * MPC/config/connectoridldefaults.mpb * MPC/config/dds4ccm.mpb * MPC/config/dds4ccm_base.mpb * MPC/config/dds4ccm_ts_default.mpb More portability changes
author: Johnny Willemsen <jwillemsen@remedy.nl> 2010-02-23 07:25:06 +0000
committer: Johnny Willemsen <jwillemsen@remedy.nl> 2010-02-23 07:25:06 +0000
commit: 317837bb60140dcda373b6dfb812d788cd8bf19d (patch)
tree: 49f79d5f3e7cede205884230300d9624b80cd314
parent: 96a684d874fe0a838b6b44e7b3cf02580193d89d (diff)
download: ATCD-317837bb60140dcda373b6dfb812d788cd8bf19d.tar.gz
154 files changed, 587 insertions, 296 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 6b1a3ee9c5f..8b1e6d5e5d8 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,160 @@
+Tue Feb 23 07:22:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+        * 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/Connector/Quoter_Connector.mpc
+        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
+        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
+        * connectors/dds4ccm/idl/dds4ccm.mpc
+        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+        * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl
+        * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl
+        * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp
+        * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h
+        * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
+        * connectors/dds4ccm/impl/ndds/DataReader.h
+        * connectors/dds4ccm/impl/ndds/DataReaderListener.h
+        * connectors/dds4ccm/impl/ndds/DataWriter.h
+        * connectors/dds4ccm/impl/ndds/DataWriterListener.h
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.h
+        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
+        * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
+        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
+        * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
+        * connectors/dds4ccm/impl/ndds/Publisher.h
+        * connectors/dds4ccm/impl/ndds/PublisherListener.h
+        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
+        * connectors/dds4ccm/impl/ndds/QueryCondition.h
+        * connectors/dds4ccm/impl/ndds/ReadCondition.h
+        * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
+        * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
+        * connectors/dds4ccm/impl/ndds/StatusCondition.h
+        * connectors/dds4ccm/impl/ndds/Subscriber.h
+        * connectors/dds4ccm/impl/ndds/SubscriberListener.h
+        * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
+        * connectors/dds4ccm/impl/ndds/TopicDescription.h
+        * connectors/dds4ccm/impl/ndds/TopicListener.h
+        * connectors/dds4ccm/impl/ndds/Utils.h
+        * 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/Connector/CSL_DeadlineTest_Connector.mpc
+        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
+        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
+        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
+        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
+        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
+        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
+        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
+        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
+        * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
+        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
+        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.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/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
+        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
+        * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
+        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
+        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
+        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
+        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
+        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
+        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
+        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
+        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
+        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
+        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
+        * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
+        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
+        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
+        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
+        * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
+        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.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/Connector/QueryFilter_Test_Connector.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/Connector/Reader_Test_Connector.mpc
+        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
+        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
+        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
+        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
+        * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
+        * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.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/Connector/State_Connection_Test_Connector.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/TwoTopics/Connector/TwoTopics_Connector.mpc
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
+        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
+        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
+        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
+        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
+        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
+        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+        * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+        * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
+        * MPC/config/connectoridldefaults.mpb
+        * MPC/config/dds4ccm.mpb
+        * MPC/config/dds4ccm_base.mpb
+        * MPC/config/dds4ccm_ts_default.mpb
+          More portability changes
+
 Tue Feb 23 04:44:49 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp:
@@ -68,8 +225,7 @@ Mon Feb 22 21:39:08 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
 
         * examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp:
         * examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp:
-
-          Add a couple of deploymeny plans to test the PlanLocality feature.
+          Add a couple of deployment plans to test the PlanLocality feature.
 
 Mon Feb 22 20:48:36 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
 
diff --git a/CIAO/MPC/config/connectoridldefaults.mpb b/CIAO/MPC/config/connectoridldefaults.mpb
index fadaf6a5b3f..f4f2b22ed7a 100644
--- a/CIAO/MPC/config/connectoridldefaults.mpb
+++ b/CIAO/MPC/config/connectoridldefaults.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project : componentidldefaults {
- idlflags += -Gcn -Gxhcn -I$(CIAO_ROOT)/connectors
+ idlflags += -Gcn -Gxhcn -I$(CIAO_ROOT)/connectors -Sa -St
  idlflags -= -Gxhex
 
   Modify_Custom (IDL) {
diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb
new file mode 100644
index 00000000000..8c07b2633fa
--- /dev/null
+++ b/CIAO/MPC/config/dds4ccm.mpb
@@ -0,0 +1,17 @@
+// $Id$
+
+feature(dds4ccm_opendds) : taoidldefaults, dcps {
+  macros += CIAO_DDS4CCM_OPENDDS=1
+  idlflags += -DCIAO_DDS4CCM_OPENDDS=1
+}
+
+feature(dds4ccm_splice) : taoidldefaults {
+  macros += CIAO_DDS4CCM_SPLICE=1
+  idlflags += -DCIAO_DDS4CCM_SPLICE=1
+}
+
+feature(dds4ccm_ndds) : taoidldefaults {
+  macros += CIAO_DDS4CCM_NDDS=1
+  idlflags += -DCIAO_DDS4CCM_NDDS=1
+}
+
diff --git a/CIAO/MPC/config/dds4ccm_base.mpb b/CIAO/MPC/config/dds4ccm_base.mpb
index bfceaec6111..59c785fbe94 100644
--- a/CIAO/MPC/config/dds4ccm_base.mpb
+++ b/CIAO/MPC/config/dds4ccm_base.mpb
@@ -1,17 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-feature(dds4ccm_opendds) : ciao_connector_base, dcps {
+feature(dds4ccm_opendds) : dds4ccm, ciao_connector_base, dcps {
   after += DDS4CCM_stub DDS4CCM_lem_gen
   libs += DDS4CCM_stub
 }
 
-feature(dds4ccm_splice) : ciao_connector_base {
+feature(dds4ccm_splice) : dds4ccm, ciao_connector_base {
   after += DDS4CCM_stub DDS4CCM_lem_gen
   libs += DDS4CCM_stub
 }
 
-feature(dds4ccm_ndds) : ciao_connector_base, nddslib {
+feature(dds4ccm_ndds) : dds4ccm, ciao_connector_base, nddslib {
   after += DDS4CCM_stub DDS4CCM_lem_gen
   libs += DDS4CCM_stub
 }
diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb
index eee04b8ccf9..8f0721fbedf 100644
--- a/CIAO/MPC/config/dds4ccm_ts_default.mpb
+++ b/CIAO/MPC/config/dds4ccm_ts_default.mpb
@@ -1,18 +1,18 @@
 // $Id$
 
-feature(dds4ccm_opendds) : dcps_ts_defaults, dcps {
+feature(dds4ccm_opendds) : dds4ccm, dcps_ts_defaults, dcps {
   Define_Custom(DDSGenerator) : TypeSupport {
     keyword opendds_ts_flags = commandflags
   }
 }
 
-feature(dds4ccm_splice) : splice_ts_defaults {
+feature(dds4ccm_splice) : dds4ccm, splice_ts_defaults {
   Define_Custom(DDSGenerator) : SpliceTypeSupport {
     keyword opendds_ts_flags = commandflags
   }
 }
 
-feature(dds4ccm_ndds) : ndds_ts_defaults, nddslib {
+feature(dds4ccm_ndds) : dds4ccm, ndds_ts_defaults, nddslib {
   Define_Custom(DDSGenerator) : NDDSTypeSupport {
   }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
index 007fb579243..65071745d9b 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
@@ -9,6 +9,7 @@
 #define HELLO_BASE_IDL
 
 #pragma ndds typesupport "Base/Hello_BaseSupport.h"
+#pragma opendds typesupport "Base/Hello_BaseTypeSupportC.h"
 
 #pragma DCPS_DATA_TYPE "DDSHello"
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
index fb5a494e4c0..29cbfc5cbda 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Hello_Connector_idl_gen) : connectoridldefaults {
+project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   avoids += ace_for_tao
   after  += DDS4CCM_idl_gen
   custom_only = 1
@@ -19,7 +19,7 @@ project(DDS_Hello_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   avoids += ace_for_tao
   custom_only = 1
   after += DDS_Hello_Connector_idl_gen
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
index 783de99df91..02de4b48707 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Hello_Receiver_idl_gen) : componentidldefaults {
+project(DDS_Hello_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   avoids += ace_for_tao
   custom_only = 1
   after += DDS_Hello_Connector_idl_gen
@@ -18,7 +18,7 @@ project(DDS_Hello_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Hello_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_Hello_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   avoids += ace_for_tao
   after += DDS_Hello_Receiver_idl_gen
   custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
index 1afe7ac9bfe..75ffd5ce6fa 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Hello_Sender_idl_gen) : componentidldefaults {
+project(DDS_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm {
   avoids += ace_for_tao
   after  += DDS_Hello_Connector_idl_gen
   custom_only = 1
@@ -19,7 +19,7 @@ project(DDS_Hello_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Hello_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_Hello_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   avoids += ace_for_tao
   after  += DDS_Hello_Sender_idl_gen
   custom_only = 1
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
index 0d6f96ea9b3..53f355f5d7e 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Broker"
 
-project(DDS_Broker_idl_gen) : componentidldefaults {
+project(DDS_Broker_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Quoter_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=BROKER_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_Broker_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Broker_lem_gen) : ciaoidldefaults {
+project(DDS_Broker_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Broker_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=BROKER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
index fc8ab5937b0..67eadefb5ba 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l .. -o ../lib -u DDS Quoter_Connector"
 
-project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults {
+project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_Quoter_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_Quoter_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Quoter_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
index a109eb94d00..6fcead8c9f9 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l ../lib -o ../lib -c controller -u DDS Distributor"
 
-project(DDS_Distributor_idl_gen) : componentidldefaults {
+project(DDS_Distributor_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_Quoter_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Distributor_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Distributor_lem_gen) : ciaoidldefaults {
+project(DDS_Distributor_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Distributor_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DISTRIBUTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
index 6fd1e324319..a91758a3efd 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l .. -o ../lib -u DDS Shapes_Connector"
 
-project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults {
+project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_Shapes_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Shapes_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
index a7e12cec644..cb97f698b46 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver"
 
-project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults {
+project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Shapes_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Shapes_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Shapes_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
index acd6b262229..c03bbe91e4a 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Shapes_Sender_idl_gen) : componentidldefaults {
+project(DDS_Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_Shapes_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Shapes_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Shapes_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Shapes_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc
index 7b4a3425cb8..1d2caee3577 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (DDS4CCM_idl_gen) : ciaoidldefaults, anytypecode {
+project (DDS4CCM_idl_gen) : dds4ccm, ciaoidldefaults, dds4ccm {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DDS4CCM_STUB_Export \
               -Wb,stub_export_include=dds4ccm_stub_export.h \
@@ -9,7 +9,7 @@ project (DDS4CCM_idl_gen) : ciaoidldefaults, anytypecode {
               -I$(CIAO_ROOT)/connectors -Glem
 
   IDL_Files {
-    idlflags += -Gxhst -Gxhsk -Glem -Glfa -SS
+    idlflags += -Gxhst -Gxhsk -SS
     dds4ccm_Base.idl
   }
 
@@ -24,7 +24,7 @@ project (DDS4CCM_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project (DDS4CCM_lem_gen) : ciaoidldefaults, anytypecode {
+project (DDS4CCM_lem_gen) : dds4ccm, ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS4CCM_idl_gen
   idlflags += -I$(CIAO_ROOT)/connectors \
@@ -47,7 +47,7 @@ project (DDS4CCM_lem_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project (DDS4CCM_stub) : ccm_stub, ciaolib_with_idl, ciao_output, taolib, anytypecode {
+project (DDS4CCM_stub) : dds4ccm, ccm_stub, ciaolib_with_idl, ciao_output, taolib {
 
   after += DDS4CCM_idl_gen
   includes += $(CIAO_ROOT)/connectors
@@ -78,7 +78,7 @@ project (DDS4CCM_stub) : ccm_stub, ciaolib_with_idl, ciao_output, taolib, anytyp
   }
 }
 
-project (DDS4CCM_lem_stub) : ccm_svnt, ciaolib_with_idl, ciao_output, taolib, valuetype, anytypecode, ifr_client {
+project (DDS4CCM_lem_stub) : dds4ccm, ccm_svnt, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client {
   after += DDS4CCM_stub DDS4CCM_lem_gen
   libs  += DDS4CCM_stub
   includes += $(CIAO_ROOT)/connectors
@@ -110,7 +110,7 @@ project (DDS4CCM_lem_stub) : ccm_svnt, ciaolib_with_idl, ciao_output, taolib, va
   }
 }
 
-project (DDS4CCM_skel) : ciaolib_with_idl, ciao_output, taolib, anytypecode, portableserver, ciao_servant {
+project (DDS4CCM_skel) : dds4ccm, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant {
   after += DDS4CCM_stub
   libs  += DDS4CCM_stub
   includes += $(CIAO_ROOT)/connectors
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
index f6a0a1b1acc..3a98aaae951 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
@@ -5,6 +5,12 @@
 
 #pragma ciao lem "connectors/dds4ccm/idl/dds_rtf2_dcpsE.idl"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+# include "dds/DdsDcps.idl"
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+
 #define DOMAINID_TYPE_NATIVE    long
 #define HANDLE_TYPE_NATIVE      long
 #define HANDLE_NIL_NATIVE       0
@@ -1249,3 +1255,5 @@ module DDS {
 };
 
 #endif
+
+#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl
index 02fd03e9bdd..7bb3d3b6e47 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl
@@ -5,6 +5,8 @@
 
 #pragma ciao lem "connectors/dds4ccm/idl/dds_rtf2_dcps_i_handleE.idl"
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+
 module DDS {
     struct NativeInstanceHandle_t {
         octet value[16];
@@ -16,3 +18,5 @@ module DDS {
 };
 
 #endif
+
+#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl
index 45d9515937c..a80d5e75bea 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl
@@ -3,6 +3,8 @@
 #ifndef DDS_RFT2_DCPS_INSTANCE_HANDLE_IDL
 #define DDS_RFT2_DCPS_INSTANCE_HANDLE_IDL
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+
 #include "dds_rtf2_dcps_i_handle.idl"
 
 module DDS {
@@ -10,3 +12,5 @@ module DDS {
 };
 
 #endif
+
+#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp
index bceb22e2770..3fe4af04da8 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp
@@ -3,6 +3,8 @@
 
 #include "dds_rtf2_dcps_instance_handleC.h"
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+
 static ::DDS::InstanceHandle_t S_HANDLE = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 16, 0};
 
 namespace DDS
@@ -10,3 +12,4 @@ namespace DDS
   ::DDS::InstanceHandle_t const HANDLE_NIL = S_HANDLE;
 }
 
+#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h
index fd777ae27ac..9d8723910b7 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h
@@ -21,11 +21,15 @@
 // TAO_IDL - Generated from
 // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_root/root_ch.cpp:62
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+
 namespace DDS
 {
   extern DDS4CCM_STUB_Export ::DDS::InstanceHandle_t const HANDLE_NIL;
 }
 
+#endif
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
index 9f65f625db2..3823a6a797c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
@@ -13,9 +13,12 @@
 #include "ace/Copy_Disabled.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if !defined (DDS_MAJOR_VERSION)
-#include "ndds/ndds_cpp.h"
-#else
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+# include "ndds/ndds_cpp.h"
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+# include "dds/DdsDcpsC.h"
 typedef ::DDS::Publisher DDSPublisher;
 #endif
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
index 2ad6ed1a668..015f26c870d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
@@ -17,9 +17,11 @@
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 #include "tao/LocalObject.h"
 
-#if !defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 # include "ndds/ndds_cpp.h"
-#else
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::DataReader DDSDataReader;
 #endif
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
index 373cd469f7a..c7b4b339291 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
@@ -14,7 +14,20 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm_ndds_impl_export.h"
 
-#include "ndds/ndds_cpp.h"
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+# include "ndds/ndds_cpp.h"
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DataReaderListener DDSDataReaderListener;
+typedef ::DDS::DataReader DDSDataReader;
+typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus;
+typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus;
+typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus;
+typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus;
+typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus;
+typedef ::DDS::SampleLostStatus DDS_SampleLostStatus;
+#endif
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
index 27abd3fcf7c..b249c023b6f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
@@ -17,9 +17,11 @@
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 #include "tao/LocalObject.h"
 
-#if !defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#else
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::DataWriter DDSDataWriter;
 #endif
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
index 29462493c48..fb3ec35b0cc 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
@@ -17,7 +17,9 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#include "ndds/ndds_cpp.h"
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+# include "ndds/ndds_cpp.h"
+#endif
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
index 5e2a501f42a..4b6feb0043f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
@@ -12,14 +12,14 @@
 
 #include "tao/LocalObject.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
-
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if !defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#else
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::DomainParticipant DDSDomainParticipant;
 #endif
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
index 0fd77cee91b..bdd50264478 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
@@ -15,7 +15,13 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm_ndds_impl_export.h"
 
-#include "ndds/ndds_cpp.h"
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+# include "ndds/ndds_cpp.h"
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DomainParticipantListener DDSDomainParticipantListener;
+#endif
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
index 31585e1a0d5..d4e90922b9e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
@@ -17,12 +17,14 @@ operator<<= (::DDS::InconsistentTopicStatus &ddsstatus, const ::DDS_Inconsistent
   ddsstatus.total_count_change = status.total_count_change;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_InconsistentTopicStatus &ddsstatus, const ::DDS::InconsistentTopicStatus & status)
 {
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
 }
+#endif
 
 inline void
 operator>>= (const ::DDS_InconsistentTopicStatus &status, ::DDS::InconsistentTopicStatus & ddsstatus)
@@ -31,11 +33,13 @@ operator>>= (const ::DDS_InconsistentTopicStatus &status, ::DDS::InconsistentTop
   ddsstatus.total_count_change = status.total_count_change;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::InconsistentTopicStatus &status, ::DDS_InconsistentTopicStatus & ddsstatus)
 {
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
 }
+#endif
 
 #endif /* CIAO_RTI_INCONSISTENTTOPICSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
index edaf892b6b9..9d507bbe632 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
@@ -10,8 +10,7 @@
 #ifndef CIAO_RTI_INSTANCEHANDLE_T_H
 #define CIAO_RTI_INSTANCEHANDLE_T_H
 
-#if !defined (DDS_MAJOR_VERSION)
-
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle)
 {
@@ -91,15 +90,14 @@ operator!= (const ::DDS::InstanceHandle_t & ccm_instancehandle, const DDS_Instan
          ccm_instancehandle.isValid != static_cast<CORBA::ULong>(dds_instancehandle.isValid) ||
          ACE_OS::memcmp (ccm_instancehandle.value, dds_instancehandle.keyHash.value, sizeof (ccm_instancehandle.value)) != 0;
 }
+#endif
 
-#else
-
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 inline void
 operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle)
 {
   ddsinstancehandle = instancehandle;
 }
-
 #endif
 
 #endif /* CIAO_RTI_INSTANCEHANDLE_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
index 4215f1bd160..ad814a486cf 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
@@ -22,6 +22,7 @@ operator<<= (::DDS::LivelinessChangedStatus &ddsstatus, const ::DDS_LivelinessCh
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_LivelinessChangedStatus &ddsstatus, const ::DDS::LivelinessChangedStatus & status)
 {
@@ -31,6 +32,7 @@ operator<<= (::DDS_LivelinessChangedStatus &ddsstatus, const ::DDS::LivelinessCh
   ddsstatus.not_alive_count_change = status.not_alive_count_change;
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
+#endif
 
 inline void
 operator>>= (const ::DDS_LivelinessChangedStatus &status, ::DDS::LivelinessChangedStatus & ddsstatus)
@@ -42,6 +44,7 @@ operator>>= (const ::DDS_LivelinessChangedStatus &status, ::DDS::LivelinessChang
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::LivelinessChangedStatus &status, ::DDS_LivelinessChangedStatus & ddsstatus)
 {
@@ -51,5 +54,6 @@ operator>>= (const ::DDS::LivelinessChangedStatus &status, ::DDS_LivelinessChang
   ddsstatus.not_alive_count_change = status.not_alive_count_change;
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
+#endif
 
 #endif /* CIAO_RTI_LIVELINESSCHANGEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
index fbdd4c2285d..81818d26be7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
@@ -17,7 +17,10 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#include "ndds/ndds_cpp.h"
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+# include "ndds/ndds_cpp.h"
+#endif
+
 #include "tao/LocalObject.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
index edad2f0a620..16afa936331 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
@@ -17,7 +17,10 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#include "ndds/ndds_cpp.h"
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+# include "ndds/ndds_cpp.h"
+#endif
+
 #include "tao/LocalObject.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
index a54eb46faf6..37788b70bf3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
@@ -16,19 +16,23 @@ operator<<= (::DDS::QosPolicyCountSeq &/*ddsstatus*/, const ::DDS_QosPolicyCount
   // todo
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_QosPolicyCountSeq &/*ddsstatus*/, const ::DDS::QosPolicyCountSeq & /*status*/)
 {
 }
+#endif
 
 inline void
 operator>>= (const ::DDS_QosPolicyCountSeq &/*status*/, ::DDS::QosPolicyCountSeq & /*ddsstatus*/)
 {
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::QosPolicyCountSeq &/*status*/, ::DDS_QosPolicyCountSeq & /*ddsstatus*/)
 {
 }
+#endif
 
 #endif /* CIAO_RTI_QOSPOLICYCOUNTSEQ_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
index fdb83ede77a..367a68e67a7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
@@ -17,9 +17,11 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if !defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#else
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::QueryCondition DDSQueryCondition;
 #endif
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
index c2f72f601f8..b3abe3f70ce 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
@@ -17,7 +17,14 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::ReadCondition DDSReadCondition;
+#endif
+
 #include "tao/LocalObject.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
index b657de7c1fc..20b27dc1262 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
@@ -21,6 +21,7 @@ operator<<= (::DDS::RequestedIncompatibleQosStatus &ddsstatus, const ::DDS_Reque
   ddsstatus.policies <<= status.policies;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_RequestedIncompatibleQosStatus &ddsstatus, const ::DDS::RequestedIncompatibleQosStatus & status)
 {
@@ -29,6 +30,7 @@ operator<<= (::DDS_RequestedIncompatibleQosStatus &ddsstatus, const ::DDS::Reque
   ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id);
   ddsstatus.policies <<= status.policies;
 }
+#endif
 
 inline void
 operator>>= (const ::DDS_RequestedIncompatibleQosStatus &status, ::DDS::RequestedIncompatibleQosStatus & ddsstatus)
@@ -39,6 +41,7 @@ operator>>= (const ::DDS_RequestedIncompatibleQosStatus &status, ::DDS::Requeste
   ddsstatus.policies <<= status.policies;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::RequestedIncompatibleQosStatus &status, ::DDS_RequestedIncompatibleQosStatus & ddsstatus)
 {
@@ -47,5 +50,6 @@ operator>>= (const ::DDS::RequestedIncompatibleQosStatus &status, ::DDS_Requeste
   ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id);
   ddsstatus.policies <<= status.policies;
 }
+#endif
 
 #endif /* CIAO_RTI_REQUESTEDINCOMPATIBLEQOSSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
index 09bee568910..d3605e33c0e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
@@ -21,6 +21,7 @@ operator<<= (::DDS::SampleRejectedStatus &ddsstatus, const ::DDS_SampleRejectedS
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_SampleRejectedStatus &ddsstatus, const ::DDS::SampleRejectedStatus & status)
 {
@@ -29,6 +30,7 @@ operator<<= (::DDS_SampleRejectedStatus &ddsstatus, const ::DDS::SampleRejectedS
   ddsstatus.last_reason = static_cast < ::DDS_SampleRejectedStatusKind> (status.last_reason);
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
+#endif
 
 inline void
 operator>>= (const ::DDS_SampleRejectedStatus &status, ::DDS::SampleRejectedStatus & ddsstatus)
@@ -39,6 +41,7 @@ operator>>= (const ::DDS_SampleRejectedStatus &status, ::DDS::SampleRejectedStat
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::SampleRejectedStatus &status, ::DDS_SampleRejectedStatus & ddsstatus)
 {
@@ -47,5 +50,6 @@ operator>>= (const ::DDS::SampleRejectedStatus &status, ::DDS_SampleRejectedStat
   ddsstatus.last_reason = static_cast < ::DDS_SampleRejectedStatusKind> (status.last_reason);
   ddsstatus.last_instance_handle <<= status.last_instance_handle; 
 }
+#endif
 
 #endif /* CIAO_RTI_SAMPLEREJECTEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
index c30d2cad0bb..1b5da7373ed 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
@@ -17,7 +17,14 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#include "ndds/ndds_cpp.h"
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+# include "ndds/ndds_cpp.h"
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::StatusCondition DDSStatusCondition;
+#endif
+
 #include "tao/LocalObject.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
index 29212f3e9be..3fd624a8b70 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
@@ -19,9 +19,11 @@
 
 #include "tao/LocalObject.h"
 
-#if !defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#else
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::Subscriber DDSSubscriber;
 typedef ::DDS::DataReaderListener DDSDataReaderListener;
 typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
index d645deb217e..f832a739308 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
@@ -15,7 +15,14 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::SubscriberListener DDSSubscriberListener;
+typedef ::DDS::DataReader DDSDataReader;
+#endif
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
index 0bfbfdbab4f..0970210a80d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
@@ -22,6 +22,7 @@ operator<<= (::DDS::SubscriptionMatchedStatus &ddsstatus, const ::DDS_Subscripti
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_SubscriptionMatchedStatus &ddsstatus, const ::DDS::SubscriptionMatchedStatus & status)
 {
@@ -31,6 +32,7 @@ operator<<= (::DDS_SubscriptionMatchedStatus &ddsstatus, const ::DDS::Subscripti
   ddsstatus.current_count_change = status.current_count_change;
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
+#endif
 
 inline void
 operator>>= (const ::DDS_SubscriptionMatchedStatus &status, ::DDS::SubscriptionMatchedStatus & ddsstatus)
@@ -42,6 +44,7 @@ operator>>= (const ::DDS_SubscriptionMatchedStatus &status, ::DDS::SubscriptionM
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::SubscriptionMatchedStatus &status, ::DDS_SubscriptionMatchedStatus & ddsstatus)
 {
@@ -51,6 +54,7 @@ operator>>= (const ::DDS::SubscriptionMatchedStatus &status, ::DDS_SubscriptionM
   ddsstatus.current_count_change = status.current_count_change;
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
+#endif
 
 #endif /* CIAO_RTI_SUBSCRIPTIONMATCHEDSTATUS_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
index 314b59416fa..e3e79eae503 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
@@ -17,7 +17,10 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
+#endif
+
 #include "tao/LocalObject.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
index bcad3854c4f..25c96d6b154 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
@@ -14,7 +14,15 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm_ndds_impl_export.h"
 
-#include "ndds/ndds_cpp.h"
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+# include "ndds/ndds_cpp.h"
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::TopicListener DDSTopicListener;
+typedef ::DDS::Topic DDSTopic;
+typedef ::DDS::InconsistentTopicStatus DDS_InconsistentTopicStatus;
+#endif
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h
index 52b5a4586db..6937d5c1a98 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h
@@ -59,7 +59,9 @@ namespace CIAO
           RTI_DDS_RETCODE (DDS::PUBLICATION_MATCHED_STATUS);
           RTI_DDS_RETCODE (DDS::SUBSCRIPTION_MATCHED_STATUS);
           //RTI_DDS_RETCODE (DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS);
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
           RTI_DDS_RETCODE (DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS);
+#endif          
           //RTI_DDS_RETCODE (DDS::DATA_WRITER_CACHE_STATUS);
           //RTI_DDS_RETCODE (DDS::DATA_WRITER_PROTOCOL_STATUS);
           //RTI_DDS_RETCODE (DDS::DATA_READER_CACHE_STATUS);
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 d22ab815b8d..afa92e6a20c 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
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l .. -o ../lib -u DDS Perf_Keyed_Test_Connector"
 
-project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Perf_Keyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_LEM_STUB_Export \
@@ -32,7 +32,7 @@ project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
+project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Perf_Keyed_Test_Connector_lem_gen DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub DDS4CCM_lem_stub
   libs  += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub
   libpaths += ../lib
@@ -58,7 +58,7 @@ project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base   {
+project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
   after += DDS_Perf_Keyed_Test_Connector_idl_gen DDS_Perf_Keyed_Test_Base_stub
   libs  += DDS_Perf_Keyed_Test_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 aac0e747a73..70f081b32d5 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
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Perf_Keyed_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_Perf_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Perf_Keyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Perf_Keyed_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_Perf_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Perf_Keyed_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 23e43637321..ef148c28cd1 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
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Perf_Keyed_Test_Sender_idl_gen) : componentidldefaults   {
+project(DDS_Perf_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_Perf_Keyed_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Perf_Keyed_Test_Sender_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_Perf_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Perf_Keyed_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -31,7 +31,7 @@ project(DDS_Perf_Keyed_Test_Sender_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
+project(DDS_Perf_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Perf_Keyed_Test_Sender_lem_gen DDS_Perf_Keyed_Test_Sender_stub \
            DDS_Perf_Keyed_Test_Base_stub
   libs  += DDS_Perf_Keyed_Test_Base_stub Sender_stub
@@ -58,7 +58,7 @@ project(DDS_Perf_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base   {
+project(DDS_Perf_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base {
   after += DDS_Perf_Keyed_Test_Sender_idl_gen DDS_Perf_Keyed_Test_Base_stub \
            DDS_Perf_Keyed_Test_Connector_stub
   libs  += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub
@@ -85,7 +85,7 @@ project(DDS_Perf_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base   {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base   {
+project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base {
   after   += DDS_Perf_Keyed_Test_Sender_lem_stub DDS_Perf_Keyed_Test_Sender_stub \
              DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub \
              DDS4CCM_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 f5bb173f14a..1ec88bff520 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
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Latency_Test_Base -l .. -o ../lib -u DDS Latency_Test_Connector"
 
-project(DDS_Latency_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_Latency_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LATENCY_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Latency_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_Latency_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_Latency_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Latency_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=LATENCY_TEST_CONNECTOR_LEM_STUB_Export \
@@ -32,7 +32,7 @@ project(DDS_Latency_Test_Connector_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_Lat_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
+project(DDS_Lat_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Latency_Test_Connector_lem_gen DDS_Latency_Test_Connector_stub DDS_Latency_Test_Base_stub DDS4CCM_lem_stub
   libs  += DDS_Latency_Test_Base_stub DDS_Latency_Test_Connector_stub DDS4CCM_lem_stub
   libpaths += ../lib
@@ -58,7 +58,7 @@ project(DDS_Lat_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 }
 
-project(DDS_Latency_Test_Connector_stub) : ccm_stub, dds4ccm_base   {
+project(DDS_Latency_Test_Connector_stub) : ccm_stub, dds4ccm_base {
   after += DDS_Latency_Test_Connector_idl_gen DDS_Latency_Test_Base_stub
   libs  += DDS_Latency_Test_Base_stub
   libpaths += ../lib
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 f4d139e598c..e6a9d688078 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
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Latency_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_Latency_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Latency_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Latency_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Latency_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_Latency_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Latency_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 9a8cd621cf7..862af257568 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
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Latency_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Latency_Test_Sender_idl_gen) : componentidldefaults   {
+project(DDS_Latency_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_Latency_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Latency_Test_Sender_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_Latency_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_Latency_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Latency_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -31,7 +31,7 @@ project(DDS_Latency_Test_Sender_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_Latency_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
+project(DDS_Latency_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_Latency_Test_Sender_lem_gen DDS_Latency_Test_Sender_stub \
            DDS_Latency_Test_Base_stub
   libs  += DDS_Latency_Test_Base_stub Sender_stub
@@ -58,7 +58,7 @@ project(DDS_Latency_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 }
 
-project(DDS_Latency_Test_Sender_stub) : ccm_stub, dds4ccm_base   {
+project(DDS_Latency_Test_Sender_stub) : ccm_stub, dds4ccm_base {
   after += DDS_Latency_Test_Sender_idl_gen DDS_Latency_Test_Base_stub \
            DDS_Latency_Test_Connector_stub
   libs  += DDS_Latency_Test_Base_stub DDS_Latency_Test_Connector_stub
@@ -85,7 +85,7 @@ project(DDS_Latency_Test_Sender_stub) : ccm_stub, dds4ccm_base   {
   }
 }
 
-project(DDS_Latency_Test_Sender_exec) : ciao_executor, dds4ccm_base   {
+project(DDS_Latency_Test_Sender_exec) : ciao_executor, dds4ccm_base {
   after   += DDS_Latency_Test_Sender_lem_stub DDS_Latency_Test_Sender_stub \
              DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Connector_stub \
              DDS4CCM_lem_stub
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
index b5da17377e8..520f2c0c924 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l .. -o ../lib -u DDS CSL_DeadlineTest_Connector"
 
-project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults {
+project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_CSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
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 f02b9c16eb1..d617b0cbbaf 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults {
+project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_CSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_CSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_CSL_DeadlineTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 f0d4a831f04..a35d1f4f89d 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults {
+project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_CSL_DT_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_CSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_CSL_DeadlineTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
index aa8ae6170c0..69e9c5ad3e0 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l .. -o ../lib -u DDS CSL_QoSTest_Connector"
 
-project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults {
+project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_CSL_QoSTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_LEM_STUB_Export \
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 306e3857d8b..ac0db3b58d2 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults {
+project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_CSL_QoSTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_CSL_QoSTest_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_QoSTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_CSL_QoSTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 67a350622f4..19398ae21f6 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults {
+project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_CSL_QoSTest_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_CSL_QoSTest_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_QoSTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_CSL_QoSTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
index dc0dc2decd4..42a7770bb7c 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l .. -o ../lib -u DDS CSL_SRTest_Connector"
 
-project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults {
+project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_CSL_SRTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_LEM_STUB_Export \
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 6baeb6ea690..3331208340b 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults {
+project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_CSL_SRTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_CSL_SRTest_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_SRTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_CSL_SRTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 b6ae6f6436f..ba7649d7040 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults {
+project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_CSL_SRTest_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_CSL_SRTest_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_SRTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_CSL_SRTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
index 55c35b1b339..0eb13d956d3 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l .. -o ../lib -u DDS CSL_USTest_Connector"
 
-project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults {
+project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_CSL_USTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_LEM_STUB_Export \
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 c274ffb90fd..275fd4533b3 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults {
+project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_CSL_USTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_CSL_USTest_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_USTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_CSL_USTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 751f9e24818..676ed1d6a48 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults {
+project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_CSL_USTest_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_CSL_USTest_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_USTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_CSL_USTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
index 07307635bf7..36d588708cb 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l .. -o ../lib -u DDS Writer_Connector"
 
-project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults {
+project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults {
+project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_DDSWriterEntityConnector_idl_gen
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
index 22113269aca..3645300c105 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults {
+project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_DDSWriterEntityConnector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_DDSWriterEntityReceiver_lem_gen) : ciaoidldefaults {
+project(DDS_DDSWriterEntityReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_DDSWriterEntityReceiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
index 71166f968ba..87658cd8967 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults   {
+project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_DDSWriterEntityConnector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_DDSWriterEntitySender_lem_gen) : ciaoidldefaults {
+project(DDS_DDSWriterEntitySender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_DDSWriterEntitySender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
index 2e9a9e6ae90..3db8009e6ef 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l .. -o ../lib -u DDS Event_Connection_Test_Connector"
 
-project(DDS_ECT_Connector_idl_gen) : connectoridldefaults {
+project(DDS_ECT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_ECT_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_ECT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_LEM_STUB_Export \
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 14ebe3fc752..977e32bfc7c 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
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_ECT_Receiver_idl_gen) : componentidldefaults {
+project(DDS_ECT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_ECT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_ECT_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_ECT_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_ECT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_ECT_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 ab09308ad2b..8258674efe6 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
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_ECT_Sender_idl_gen) : componentidldefaults {
+project(DDS_ECT_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_ECT_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_ECT_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_ECT_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_ECT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_ECT_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
index 60e84fb4401..0da1b2b71b0 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_FSS_Event_Connector_idl_gen) : connectoridldefaults {
+project(DDS_FSS_Event_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_FSS_Event_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_FSS_Event_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_FSS_Event_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_FSS_Event_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
index 433e333e3fb..6852ed65347 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_FSS_State_Base -l .. -o ../lib -u DDS FSS_State_Connector"
 
-project(DDS_FSS_State_Connector_idl_gen) : connectoridldefaults {
+project(DDS_FSS_State_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_FSS_State_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_FSS_State_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_FSS_State_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_FSS_State_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
index dc3fb9a5b2f..cc14ce7be8f 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Get_Invoker_idl_gen) : componentidldefaults {
+project(DDS_Get_Invoker_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after +=
   idlflags += -Wb,stub_export_macro=GET_INVOKER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Get_Invoker_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Get_Invoker_lem_gen) : ciaoidldefaults {
+project(DDS_Get_Invoker_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Get_Invoker_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=GET_INVOKER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
index 52e7455c2a9..a64be229ef6 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef GETTER_TEST_BASE_IDL
 #define GETTER_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/Getter_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/Getter_Test_BaseTypeSupportC.h"
 #pragma opendds typesupport "Base/Getter_Test_BaseTypeSupportC.h"
 
 #pragma DCPS_DATA_TYPE "GetterTest"
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
index 76d0019905c..66398ad591f 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l .. -o ../lib -u DDS Getter_Test_Connector"
 
-project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Getter_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_LEM_STUB_Export \
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 f9ab9a02a3b..3bc6e99c9eb 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Getter_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Getter_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_Getter_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Getter_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 04db9090105..821ecd7deb8 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults {
+project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_Getter_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Getter_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_Getter_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Getter_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
index 7187afbcf59..eaf896a44af 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l .. -o ../lib -u DDS Writer_Connector"
 
-project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults {
+project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults {
+project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_InstanceHandleConnector_idl_gen
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
index cc784d6da2a..df9ba2d3f54 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults   {
+project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_InstanceHandleConnector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_DDSInstanceHandleSender_lem_gen) : ciaoidldefaults {
+project(DDS_DDSInstanceHandleSender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_DDSInstanceHandleSender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
index 37c7417c48e..600419c57dc 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l .. -o ../lib -u DDS Keyed_Test_Connector"
 
-project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Keyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_LEM_STUB_Export \
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 0fad13ece42..1784d080aa7 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Keyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Keyed_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 218d2229b8c..ba7ec3f4b2a 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults {
+project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_Keyed_Test_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Keyed_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Keyed_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
index ef8702d2fba..3da46b66869 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
 
-project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults {
+project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults {
+project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_KeyedWriterConnector_idl_gen
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
index 2fc458c4e59..4c41207a86c 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults {
+project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_KeyedWriterConnector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_KeyedWriterReceiver_lem_gen) : ciaoidldefaults {
+project(DDS_KeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_KeyedWriterReceiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
index bc680654d57..66be0dfb9a9 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults {
+project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_KeyedWriterConnector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_KeyedWriterSender_lem_gen) : ciaoidldefaults {
+project(DDS_KeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_KeyedWriterSender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
index b532fe7203e..909ce5b59b6 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l .. -o ../lib -u DDS LMBM_Test_Connector"
 
-project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_LMBM_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_LEM_STUB_Export \
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 adffef8a270..3cf42501a32 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_LMBM_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_LMBM_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_LMBM_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_LMBM_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 6c154cd0a3d..a83b428a029 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults {
+project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_LMBM_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_LMBM_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_LMBM_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_LMBM_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
index a7c08d84744..da90e01ab6f 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l .. -o ../lib -u DDS LNE_Test_Connector"
 
-project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_LNE_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_LEM_STUB_Export \
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 3fa344a1b3a..470e858a7d9 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_LNE_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_LNE_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_LNE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_LNE_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 ab8d208ee22..bc9340eac60 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults {
+project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_LNE_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_LNE_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_LNE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_LNE_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
index 184bc402696..d428cb604f8 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l .. -o ../lib -u DDS LOBO_Test_Connector"
 
-project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_LOBO_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_LEM_STUB_Export \
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 5de304650e6..3fd08622f06 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_LOBO_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_LOBO_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_LOBO_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_LOBO_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 e24abd5181c..65f91ced2eb 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults {
+project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_LOBO_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_LOBO_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_LOBO_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_LOBO_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
index cfe5c7d6e04..43fce05d8bf 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_NonChangeableBase -l .. -o ../lib -u DDS NonChangeable_Connector"
 
-project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults {
+project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NONCHANGEABLE_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults {
+project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_NonChangeableConnector_idl_gen
   idlflags += -Wb,stub_export_macro=NONCHANGEABLE_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
index cfc67b0a585..e25544272bf 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_OIT_Test_Base -l .. -o ../lib -u DDS ConnectorStatusListener_Test_Connector"
 
-project(DDS_OIT_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_OIT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_OIT_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_OIT_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_OIT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_OIT_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TEST_CONNECTOR_LEM_STUB_Export \
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 c2ca7210b9b..aa1d2e46dac 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
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_OIT_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_OIT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_OIT_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_OIT_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_OIT_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_OIT_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_OIT_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
index 965c04855a5..f3597fbb095 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_OIT_Test_Base -l .. -o ../lib -u DDS ConnectorStatusListener_TestSec_Connector"
 
-project(DDS_OIT_TestSec_Connector_idl_gen) : connectoridldefaults {
+project(DDS_OIT_TestSec_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_OIT_TestSec_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_OIT_TestSec_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_OIT_TestSec_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_OIT_TestSec_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_LEM_STUB_Export \
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 d32be4f5ad2..100fc162b89 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
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_OIT_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_OIT_Test_Sender_idl_gen) : componentidldefaults {
+project(DDS_OIT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_OIT_Test_Connector_idl_gen DDS_OIT_TestSec_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_OIT_Test_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_OIT_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_OIT_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_OIT_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
index 88e15afda50..036a1c19cbb 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l .. -o ../lib -u DDS PSL_DeadlineTest_Connector"
 
-project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults {
+project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_PSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
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 bbdc162021b..a0555d8bef9 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults {
+project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_PSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_PSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_PSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_PSL_DeadlineTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 011f7599b8b..39b3145ac3e 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults {
+project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_PSL_DT_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_PSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_PSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_PSL_DeadlineTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
index 0ee6507bfbb..5163c759a9b 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l .. -o ../lib -u DDS PSL_SampleLost_Connector"
 
-project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults {
+project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_PSL_SL_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_LEM_STUB_Export \
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 7cca478519d..b0d5445c89a 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults {
+project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_PSL_SL_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_PSL_SampleLost_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_PSL_SampleLost_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_PSL_SampleLost_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 2c0dda9fb62..4ddaf76560c 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults {
+project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_PSL_SL_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_PSL_SampleLost_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_PSL_SampleLost_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_PSL_SampleLost_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
index 27fb912dfd1..0a2bd52b3ab 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_QueryFilter_Starter_idl_gen) : componentidldefaults {
+project(DDS_QueryFilter_Starter_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after +=
   idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_QueryFilter_Starter_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_QueryFilter_Starter_lem_gen) : ciaoidldefaults {
+project(DDS_QueryFilter_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_QueryFilter_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
index 5d53907bf0d..7b89644b000 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p QueryFilter_Test_Base -l .. -o ../lib -u DDS QueryFilter_Test_Connector"
 
-project(QueryFilter_Test_Connector_idl_gen) : connectoridldefaults {
+project(QueryFilter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_FILTER_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(QueryFilter_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(QueryFilter_Test_Connector_lem_gen) : ciaoidldefaults {
+project(QueryFilter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += QueryFilter_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=QUERY_FILTER_TEST_CONNECTOR_LEM_STUB_Export \
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 a0271f308ba..08a37a3729c 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(QueryFilter_Test_Receiver_idl_gen) : componentidldefaults {
+project(QueryFilter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += QueryFilter_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(QueryFilter_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(QueryFilter_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(QueryFilter_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += QueryFilter_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 f52071d3fd4..faa7da39896 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p QueryFilter_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(QueryFilter_Test_Sender_idl_gen) : componentidldefaults {
+project(QueryFilter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += QueryFilter_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(QueryFilter_Test_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(QueryFilter_Test_Sender_lem_gen) : ciaoidldefaults {
+project(QueryFilter_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += QueryFilter_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
index 8ae5f2df6e4..07ac012bf4f 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Reader_Starter_idl_gen) : componentidldefaults {
+project(DDS_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after +=
   idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Reader_Starter_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Reader_Starter_lem_gen) : ciaoidldefaults {
+project(DDS_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Reader_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
index 614b24dd829..6f5085d706d 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l .. -o ../lib -u DDS Reader_Test_Connector"
 
-project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Reader_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_LEM_STUB_Export \
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 6abb390494a..d089841d4dd 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Reader_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Reader_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_Reader_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Reader_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 8d83f79fe8c..6679ff15677 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults {
+project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_Reader_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Reader_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_Reader_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Reader_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
index b94119f57ea..10358979cc9 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l .. -o ../lib -u DDS SL_Disabled_Connector"
 
-project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults {
+project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SL_OC_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_LEM_STUB_Export \
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 ad16ea7629a..a3cae392d76 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults {
+project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SL_OC_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_SL_Disabled_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_SL_Disabled_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SL_Disabled_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 3e8f3c72a96..43f66775112 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults {
+project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_SL_OC_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_SL_Disabled_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_SL_Disabled_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SL_Disabled_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
index f7c5a3ff88d..62a73316511 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l .. -o ../lib -u DDS SL_ManyByMany_Connector"
 
-project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults {
+project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SL_MBM_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_LEM_STUB_Export \
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 8bfdfa70bcb..116d76ed1df 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults {
+project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SL_MBM_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_SL_ManyByMany_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_SL_ManyByMany_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SL_ManyByMany_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 89844656a39..6ca574dfe16 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults {
+project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_SL_MBM_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_SL_ManyByMany_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_SL_ManyByMany_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SL_ManyByMany_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
index d9bddedbaea..f1213f4f2bb 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l .. -o ../lib -u DDS SL_OneByOne_Connector"
 
-project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults {
+project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SL_OBO_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_LEM_STUB_Export \
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 36c68fe47da..e8e2edad607 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults {
+project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SL_OBO_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_SL_OneByOne_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_SL_OneByOne_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SL_OneByOne_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 964d387b122..347d73bca4e 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults {
+project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_SL_OBO_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_SL_OneByOne_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_SL_OneByOne_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SL_OneByOne_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
index 9a219ed11f6..b5b6cf6eba2 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SCABase -l .. -o ../lib -u DDS SetConnectorAttribute_Connector"
 
-project(DDS_SCAConnector_idl_gen) : connectoridldefaults {
+project(DDS_SCAConnector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SCAConnector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SCAConnector_lem_gen) : ciaoidldefaults {
+project(DDS_SCAConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SCAConnector_idl_gen
   idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
index dd10b3c00ad..e5a1dc9fb37 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
 
-project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults   {
+project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_SharedDP_Connector1_idl_gen DDS_SharedDP_Connector2_idl_gen \
            DDS_SharedDP_Connector3_idl_gen
   custom_only = 1
@@ -20,7 +20,7 @@ project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_SharedDP_DDComponent_lem_gen) : ciaoidldefaults {
+project(DDS_SharedDP_DDComponent_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SharedDP_DDComponent_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
index e824470b722..b2ca127ea95 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults {
+project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults {
+project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SharedDP_Connector1_idl_gen
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
index 52e1c8b2206..2bff6a11fe2 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults {
+project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults {
+project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SharedDP_Connector2_idl_gen
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
index 41a76dfaa53..53dd14b8e7d 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults {
+project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults {
+project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SharedDP_Connector3_idl_gen
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
index de0dc70d02b..b49e7da658d 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
 
-project(DDS_SharedDPComponent_idl_gen) : componentidldefaults   {
+project(DDS_SharedDPComponent_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_SharedDP_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SharedDPComponent_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_SharedDPComponent_lem_gen) : ciaoidldefaults {
+project(DDS_SharedDPComponent_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SharedDPComponent_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
index 216ecfe9343..7f3b173b1e4 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults {
+project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SharedDP_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
index 21697a3c9f5..6aab30884a2 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l .. -o ../lib -u DDS State_Connection_Test_Connector"
 
-project(DDS_SCT_Connector_idl_gen) : connectoridldefaults {
+project(DDS_SCT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SCT_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SCT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_LEM_STUB_Export \
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 348489dc248..bedaeac439f 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
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SCT_Receiver_idl_gen) : componentidldefaults {
+project(DDS_SCT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_SCT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_SCT_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_SCT_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_SCT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SCT_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 bff93b3d731..97b11af7e00 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
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_SCT_Sender_idl_gen) : componentidldefaults {
+project(DDS_SCT_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_SCT_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SCT_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_SCT_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_SCT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_SCT_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
index 9a5aac0cf37..baaa0cf09fb 100755
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_TwoTopics_Base -l .. -o ../lib -u DDS TwoTopics_Connector"
 
-project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults {
+project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_TwoTopics_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
index 886454fbaea..e670667cddb 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults {
+project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_TTDN_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
index 602fdefe7da..daf5747ca7f 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l .. -o ../lib -u DDS Unkeyed_Test_Connector"
 
-project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults {
+project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Unkeyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_LEM_STUB_Export \
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 e96f5cbc5a1..dbfac305cbf 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults {
+project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_Unkeyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Unkeyed_Test_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_Unkeyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Unkeyed_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
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 366f9895295..547001eafca 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults {
+project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_Unkeyed_Test_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Unkeyed_Test_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_Unkeyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Unkeyed_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
index 243fbc4b068..511459c884e 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
 
-project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults {
+project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults {
+project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_UnkeyedWriterConnector_idl_gen
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
index 20b80aae24a..27862554d8d 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults {
+project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_UnkeyedWriterConnector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_UnkeyedWriterReceiver_lem_gen) : ciaoidldefaults {
+project(DDS_UnkeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_UnkeyedWriterReceiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
index 8091fc75b2d..643847c1268 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults {
+project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_UnkeyedWriterConnector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_UnkeyedWriterSender_lem_gen) : ciaoidldefaults {
+project(DDS_UnkeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_UnkeyedWriterSender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
index 666e1656d13..a5dc883e437 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l .. -o ../lib -u DDS Updater_Connector"
 
-project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults {
+project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_UPDATER_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
index ae6245eb9b8..7ce29bcf3db 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Updater_Receiver_idl_gen) : componentidldefaults {
+project(DDS_Updater_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_UPDATER_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Updater_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Updater_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_Updater_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Updater_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
index 741da23e378..d1097877d1d 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Updater_Sender_idl_gen) : componentidldefaults {
+project(DDS_Updater_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_UPDATER_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Updater_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_Updater_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_Updater_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_Updater_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
index 32911713e28..db5fab8544d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Array_Connector"
 
-project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults {
+project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_VT_ARRAY_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
index 089fb797ff2..a94c92eecc2 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Seq_Connector"
 
-project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults {
+project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_VT_SEQ_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
index ebcda44d646..4d5468ae4a6 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_String_Connector"
 
-project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults {
+project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_VT_STRING_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
index 2475bee40c3..861bcd0e2e9 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VTopic_Connector"
 
-project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults {
+project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_VTopic_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
index 6753d378972..88a3788a0db 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults   {
+project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_VTopic_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_VTopic_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_VTopic_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_VTopic_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -30,7 +30,7 @@ project(DDS_VTopic_Receiver_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_VTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base   {
+project(DDS_VTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_VTopic_Receiver_lem_gen DDS_VTopic_Receiver_stub DDS_VTopic_Base_stub
   libs  += DDS_VTopic_Base_stub Receiver_stub
   libpaths += ../lib
@@ -56,7 +56,7 @@ project(DDS_VTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 }
 
-project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base   {
+project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base {
   after += DDS_VTopic_Receiver_idl_gen DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub  DDS_VT_String_Connector_lem_stub DDS_VT_Array_Connector_lem_stub DDS_VT_Seq_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub  DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub
   libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub  DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub  DDS_VT_Seq_Connector_stub
   includes += ..
@@ -82,7 +82,7 @@ project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base   {
   }
 }
 
-project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_base   {
+project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_base {
   after   += DDS_VTopic_Receiver_lem_stub DDS_VTopic_Receiver_stub DDS_VTopic_Connector_lem_stub  DDS_VT_Array_Connector_lem_stub DDS_VT_String_Connector_lem_stub DDS_VT_Seq_Connector_lem_stub DDS_VTopic_Connector_stub   DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub
   sharedname = Receiver_exec
   libs += Receiver_stub Receiver_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
index 71bcd8be17d..5935fa1d1e2 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_VTopic_Sender_idl_gen) : componentidldefaults   {
+project(DDS_VTopic_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_VTopic_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VTopic_Sender_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_VTopic_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_VTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_VTopic_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -31,7 +31,7 @@ project(DDS_VTopic_Sender_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_VTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
+project(DDS_VTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_VTopic_Sender_lem_gen DDS_VTopic_Sender_stub DDS_VTopic_Base_stub
   libs  += DDS_VTopic_Base_stub Sender_stub
   libpaths += ../lib
@@ -57,7 +57,7 @@ project(DDS_VTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 }
 
-project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base   {
+project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base {
   after += DDS_VTopic_Sender_idl_gen DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub  DDS_VT_String_Connector_lem_stub DDS_VT_Array_Connector_lem_stub DDS_VT_Seq_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub  DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub
   libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub  DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub  DDS_VT_Seq_Connector_stub
   includes += ..
@@ -83,7 +83,7 @@ project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base   {
   }
 }
 
-project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_base   {
+project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_base {
   after   += DDS_VTopic_Sender_lem_stub DDS_VTopic_Sender_stub DDS_VTopic_Connector_lem_stub  DDS_VT_Array_Connector_lem_stub DDS_VT_String_Connector_lem_stub DDS_VT_Seq_Connector_lem_stub DDS_VTopic_Connector_stub   DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub
   sharedname = Sender_exec
   libs += Sender_stub Sender_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
index 68441c30d6e..3cb46e8ebb7 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Array_Connector"
 
-project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults {
+project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_VTS_ARRAY_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
index a872c3eaa29..9bb44c3f8fb 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Seq_Connector"
 
-project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults {
+project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_VTS_SEQ_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
index c93701ff54f..02693e92602 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_String_Connector"
 
-project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults {
+project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_VTS_STRING_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
index a7ee8569970..e8baf8482f8 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTopics_Connector"
 
-project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults {
+project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_VTopics_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
index d29787c357d..5d33a5a10e5 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults {
+project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
   after += DDS_VTopics_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_VTopics_Receiver_lem_gen) : ciaoidldefaults {
+project(DDS_VTopics_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_VTopics_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
index f730be4ac52..2fb5e26ec21 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // 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   {
+project(DDS_VTopics_Sender_idl_gen) : componentidldefaults, dds4ccm {
   after += DDS_VTopics_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VTopics_Sender_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_VTopics_Sender_lem_gen) : ciaoidldefaults {
+project(DDS_VTopics_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   after += DDS_VTopics_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -31,7 +31,7 @@ project(DDS_VTopics_Sender_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_VTopics_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
+project(DDS_VTopics_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
   after += DDS_VTopics_Sender_lem_gen DDS_VTopics_Sender_stub DDS_VTopics_Base_stub
   libs  += DDS_VTopics_Base_stub Sender_stub
   libpaths += ../lib
@@ -57,7 +57,7 @@ project(DDS_VTopics_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 }
 
-project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base   {
+project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base {
   after += DDS_VTopics_Sender_idl_gen DDS_VTopics_Base_stub DDS_VTopics_Connector_stub  DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub
   libs  += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub  DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub
   includes += ..
@@ -83,7 +83,7 @@ project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base   {
   }
 }
 
-project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_base   {
+project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_base {
   after   += DDS_VTopics_Sender_lem_stub DDS_VTopics_Sender_stub DDS_VTopics_Connector_lem_stub  DDS_VTS_String_Connector_lem_stub DDS_VTS_Array_Connector_lem_stub DDS_VTS_Seq_Connector_lem_stub DDS_VTopics_Connector_stub  DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub
   sharedname = Sender_exec
   libs += Sender_stub Sender_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub
author	Johnny Willemsen <jwillemsen@remedy.nl>	2010-02-23 07:25:06 +0000
committer	Johnny Willemsen <jwillemsen@remedy.nl>	2010-02-23 07:25:06 +0000
commit	317837bb60140dcda373b6dfb812d788cd8bf19d (patch)
tree	49f79d5f3e7cede205884230300d9624b80cd314
parent	96a684d874fe0a838b6b44e7b3cf02580193d89d (diff)
download	ATCD-317837bb60140dcda373b6dfb812d788cd8bf19d.tar.gz