summaryrefslogtreecommitdiff
path: root/CIAO/connectors/dds4ccm
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-06-24 07:38:43 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-06-24 07:38:43 +0000
commit45da346fe68532410ad3873f44e5e7349a675b51 (patch)
tree38f1bfa25f3ec832e5af1eb8304154466418d5a0 /CIAO/connectors/dds4ccm
parent84e193ef8375e4a82fa17f64584d8495c15f4f2f (diff)
downloadATCD-45da346fe68532410ad3873f44e5e7349a675b51.tar.gz
Thu Jun 24 07:34:01 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc: * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc: * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc: * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc: * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc: * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc: * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc: * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc: * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc: * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc: * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc: * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc: * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc: * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc: * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc: * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc: * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc: * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc: * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc: * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc: * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc: * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc: * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc: * connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc: * connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc: * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc: * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc: * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc: * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc: * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc: * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc: * connectors/dds4ccm/tests/NoModule/NoModule.mpc: * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc: * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc: * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc: * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc: * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc: * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc: * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc: * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc: * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc: * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc: * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc: * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc: * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc: * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc: * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc: No need to use anytypecode as base project together with dds4ccm_ts_default, dds4ccm_ts_default is now derived from typecode, easier to maintain but also a slightly footprint reduction
Diffstat (limited to 'CIAO/connectors/dds4ccm')
-rw-r--r--CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc4
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc4
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc2
69 files changed, 71 insertions, 71 deletions
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
index 465eab68916..7b98b536556 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Hello_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Hello_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Hello_Base_stub
dynamicflags += HELLO_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc
index 407bc39ee51..fc193c65cd7 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (Large_Deployment_stub) : ciaoidldefaults, anytypecode, \
+project (Large_Deployment_stub) : ciaoidldefaults, \
portableserver, dds4ccm_ts_default {
sharedname = Large_Deployment_stub
dynamicflags += LARGE_DEPLOYMENT_COMMON_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
index d3e88495282..7685f3e6f08 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Quoter_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Quoter_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Quoter_Base_stub
dynamicflags += QUOTER_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
index 5f953ca0731..3d715321623 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Shapes_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Shapes_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Shapes_Base_stub
dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
index ce1b64666d2..663cfe3f090 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Latency_Base_plain_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Latency_Base_plain_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Latency_Base_plain_stub
dynamicflags += LATENCY_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
index e430b524732..10440358782 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(*latency_receiver_plain) : nddslib, acelib, taolib, anytypecode {
+project(*latency_receiver_plain) : nddslib, acelib, taolib, typecode {
after += DDS_Latency_Base_plain_stub
exename = DDS_receiver
libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
index a82b1b51ef3..6467dae02b5 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(*latency_sender_plain) : nddslib, acelib, taolib, anytypecode {
+project(*latency_sender_plain) : nddslib, acelib, taolib, typecode {
after += DDS_Latency_Base_plain_stub
exename = DDS_Sender
avoids += ace_for_tao
@@ -14,7 +14,7 @@ project(*latency_sender_plain) : nddslib, acelib, taolib, anytypecode {
}
}
-project(*ndds_latency_sender_plain) : nddslib, acelib, taolib, anytypecode {
+project(*ndds_latency_sender_plain) : nddslib, acelib, taolib, typecode {
after += DDS_Latency_Base_plain_stub
exename = DDS_NDDS_Sender
avoids += ace_for_tao
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
index 0de9c2eb290..216124ffbac 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Throughput_Base_stub_plain) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Throughput_Base_stub_plain) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Throughput_Base_stub
dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
index b0805a06208..59ab14bca79 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(*receiver_plain) : nddslib, acelib, taolib, anytypecode {
+project(*receiver_plain) : nddslib, acelib, taolib, typecode {
after += DDS_Throughput_Base_stub_plain
exename = DDS_receiver
libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
index 8ef25a6d75a..8f826ecd792 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(*sender_plain) : nddslib, acelib, taolib, anytypecode {
+project(*sender_plain) : nddslib, acelib, taolib, typecode {
after += DDS_Throughput_Base_stub_plain
exename = DDS_Sender
avoids += ace_for_tao
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
index a219c04cc49..d1860fec7af 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Perf_Keyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Perf_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Perf_Keyed_Test_Base_stub
dynamicflags += PERF_KEYED_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc
index b0e7e7e26b6..0dab0d18f04 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_LatencyTT_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_LatencyTT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_LatencyTT_Test_Base_stub
dynamicflags += LATENCYTT_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc
index 22a9c1a798b..0814281894a 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Throughput_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Throughput_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Throughput_Base_stub
dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
index 40aac3f95d9..a56341adf6a 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CSL_DeadlineTest_Base_stub
dynamicflags += CSL_DEADLINETEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
index 63ab9a3f374..64370bb98f5 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CSL_QoSTest_Base_stub
dynamicflags += CSL_QOSTEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
index ce968a4a7eb..a947325e8fe 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CSL_SRTest_Base_stub
dynamicflags += CSL_SRTEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
index d6df1c193f7..f8ceac4c176 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_CSL_USTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_CSL_USTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CSL_USTest_Base_stub
dynamicflags += CSL_USTEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
index 490646069a7..0a62f5f8ad7 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (CoherentUpdate_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (CoherentUpdate_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CoherentUpdate_Test_Base_stub
dynamicflags += COHERENT_UPDATE_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
index 03aaeccd529..e5c6877d383 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (CoherentWrite_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (CoherentWrite_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CoherentWrite_Test_Base_stub
dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
index b9cb32cc922..e848cec34d2 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DiffDir_stub) : taoidldefaults, anytypecode, \
+project (DiffDir_stub) : taoidldefaults, \
dds4ccm_ts_default, DiffDir {
sharedname = DiffDir_stub
dynamicflags += DIFFDIR_COMMON_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
index 976372b89c6..32f3ed4c4f6 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (CFT_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (CFT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CFT_Test_Base_stub
dynamicflags += CONTENTFILTEREDTOPIC_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
index 67c718583db..5b9359894e3 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_CFTLE_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_CFTLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CFTLE_Test_Base_stub
dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
index 8e623fa86a5..af07641daea 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (CFT_Exception_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (CFT_Exception_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CFT_Exception_Test_Base_stub
dynamicflags += CFT_EXCEPTION_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
index 365cbbf426a..991be65e286 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(CFT_ReadGet_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project(CFT_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = CFT_ReadGet_Test_Base_stub
dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
index b49b9b9e682..af88f24a777 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_CFTLS_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_CFTLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CFTLS_Test_Base_stub
dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
index 3b14f5ee862..22a4d431a35 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_DDSWriterEntityBase_stub
dynamicflags += WRITER_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
index d6ebc846c64..4cb85ab2f3f 100755
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_DNM_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_DNM_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_DNM_Base_stub
dynamicflags += DOUBLE_NESTED_MODULE_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
index 20cf270e105..7da18f7d1e6 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_ECT_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_ECT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_ECT_Base_stub
dynamicflags += EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
index ce3dc9811aa..1cb4a8bf5c8 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_FSS_Event_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_FSS_Event_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_FSS_Event_Base_stub
dynamicflags += FIXED_SIZE_STRUCT_EVENT_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
index ee553207732..c84a5728ff6 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_FSS_State_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_FSS_State_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_FSS_State_Base_stub
dynamicflags += FIXED_SIZE_STRUCT_STATE_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
index e66a32f5b3c..0090ff44ab1 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (GCE_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (GCE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = GCE_Test_Base_stub
dynamicflags += GET_COMPONENT_EVENT_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
index fcf6409cd1a..286be6ed200 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (GCS_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (GCS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = GCS_Test_Base_stub
dynamicflags += GET_COMPONENT_STATE_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
index fa70eb16af0..e86dc197785 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Getter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Getter_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Getter_Test_Base_stub
dynamicflags += GETTER_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
index dc020d1f5a5..4bf6cd7416a 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_DDSInstanceHandleBase_stub
dynamicflags += WRITER_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
index d1c5b16759b..0512a1052a7 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Keyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Keyed_Test_Base_stub
dynamicflags += KEYED_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
index 9c3fcac7283..04b2a40e092 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_KeyedWriterBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_KeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_KeyedWriterBase_stub
dynamicflags += WRITER_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
index ffb29178624..a34427b4a9e 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_LMBM_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_LMBM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_LMBM_Test_Base_stub
dynamicflags += LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
index 12bbf8ff16d..a160043900b 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_LNE_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_LNE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_LNE_Test_Base_stub
dynamicflags += LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
index 63a63895730..9d87ead6d76 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_LOBO_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_LOBO_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_LOBO_Test_Base_stub
dynamicflags += LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
index 30ea2964de5..81d106dffe1 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (NoModule_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (NoModule_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = NoModule_stub
dynamicflags += NOMODULE_COMMON_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
index 209d9203b92..4cbca890fc0 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_NonChangeableBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_NonChangeableBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_NonChangeableBase_stub
dynamicflags += NONCHANGEABLE_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
index 95ff3562b7a..ac63c4728f0 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (OIT_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (OIT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = OIT_Test_Base_stub
dynamicflags += ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
index 2f02081de48..84314058c15 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
@@ -2,7 +2,7 @@
// This file is generated with "generate_component_mpc.pl -b dds4ccm_base OFM_Connector"
project(OFM_Connector_idl_gen) : connectoridldefaults, taoidldefaults, \
- dds4ccm, anytypecode, dds4ccm_ts_default {
+ dds4ccm, dds4ccm_ts_default {
custom_only = 1
idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_STUB_Export \
-Wb,stub_export_include=OFM_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
index 5a0769306a8..3cf45439995 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_CCM_Example_PSAT_type_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_CCM_Example_PSAT_type_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_CCM_Example_PSAT_type_stub
dynamicflags += PSAT_TYPE_STUB_BUILD_DLL
libout = lib
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
index ea3bdebc233..92d5ca21790 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_PSL_DeadlineTest_Base_stub
dynamicflags += PSL_DEADLINETEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
index 69803e22c42..260ab4213cf 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_PSL_SampleLost_Base_stub
dynamicflags += PSL_SAMPLELOST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
index d8125682fb4..8623cd0656a 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (PortUsage_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (PortUsage_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = PortUsage_Test_Base_stub
dynamicflags += PORTUSAGE_EVENT_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
index 9d9f07cf4d6..550d0bd01c4 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (QosProfile_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (QosProfile_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = QosProfile_Test_Base_stub
dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
index db9a83c1c8b..ca08e0faa86 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_QCLE_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_QCLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_QCLE_Test_Base_stub
dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
index 5a2cfe855d5..eeb0924eafa 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(QC_ReadGet_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project(QC_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = QC_ReadGet_Test_Base_stub
dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
index 0427c8ccbf4..3fc6115838c 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_QCLS_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_QCLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_QCLS_Test_Base_stub
dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
index e8606e033d9..d1cba8fd39a 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Reader_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Reader_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Reader_Test_Base_stub
dynamicflags += READER_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
index 87a021362d6..ba5d711fbb6 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_SL_Disabled_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_SL_Disabled_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SL_Disabled_Base_stub
dynamicflags += SL_DISABLED_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
index 0730e183bb9..ad7b7a6ddb4 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SL_ManyByMany_Base_stub
dynamicflags += SL_MANYBYMANY_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
index 96f81db664a..1936e7fa060 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SL_OneByOne_Base_stub
dynamicflags += SL_ONEBYONE_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
index 5d5a42ccba8..166889cf4bc 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_SCABase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_SCABase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SCABase_stub
dynamicflags += SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
index 5ef7334a4bc..1a4aed690a3 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_SharedDP_DDBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_SharedDP_DDBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SharedDP_DDBase_stub
dynamicflags += BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
index 00ca646663f..4378a77b3a0 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_SharedDPBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_SharedDPBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SharedDPBase_stub
dynamicflags += BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
index a0c2462af7b..82d78bb09c9 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_SCT_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_SCT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_SCT_Base_stub
dynamicflags += STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
index 2046f252b05..d51a26e5b86 100755
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_TwoTopics_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_TwoTopics_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_TwoTopics_Base_stub
dynamicflags += TWOTOPICS_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
index b4c18b66c2d..9d2b4c48423 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Goodbye_Namespace_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Goodbye_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Goodbye_Namespace_Base_stub
dynamicflags += GOODBYE_NAMESPACE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
index 7bfd2ea596a..c4f92576db2 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Hello_Namespace_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Hello_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Hello_Namespace_Base_stub
dynamicflags += HELLO_NAMESPACE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
index 51a38f0973b..384ea4117a4 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Unkeyed_Test_Base_stub
dynamicflags += UNKEYED_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
index 014070bbbab..58a0f1a3012 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_UnkeyedWriterBase_stub
dynamicflags += WRITER_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
index 97490cd2c74..8191f040a80 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_Updater_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_Updater_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = DDS_Updater_Base_stub
dynamicflags += UPDATER_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
index 5db7e529df0..5d96c062799 100755
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (UCC_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (UCC_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
sharedname = UCC_Test_Base_stub
dynamicflags += USERDATA_COPY_COUNT_TEST_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
index 8eadd06dcb4..6c79d25bd85 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (DDS_VTopic_Base_stub) : taoidldefaults, anytypecode, \
+project (DDS_VTopic_Base_stub) : taoidldefaults, \
dds4ccm_ts_default, valuetype {
sharedname = DDS_VTopic_Base_stub
dynamicflags += VTOPIC_BASE_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
index 1ce360b9201..84ec15fdbc8 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
@@ -1,7 +1,7 @@
// $Id$
-project (DDS_VTopics_Base_stub) : taoidldefaults, anytypecode, \
- dds4ccm_ts_default,valuetype {
+project (DDS_VTopics_Base_stub) : taoidldefaults, \
+ dds4ccm_ts_default, valuetype {
sharedname = DDS_VTopics_Base_stub
dynamicflags += VTOPICS_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc
index ec0ac5ab098..b6ff0332cec 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (Shapes_msg_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default, Shapes {
+project (Shapes_msg_stub) : taoidldefaults, dds4ccm_ts_default, Shapes {
idlflags += -SS -Sci \
-Wb,stub_export_macro=SHAPES_MSG_STUB_Export \
-Wb,stub_export_include=Shapes_msg_stub_export.h \