summaryrefslogtreecommitdiff
path: root/CIAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-04-11 12:30:52 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-04-11 12:30:52 +0000
commit34261adcbda31b367d99dd0257274c526a25bb65 (patch)
tree0e30f76007055cbf692679fbc66bb291c881b4fa /CIAO
parentbbe069d7d7b579048b3f0d217895e615dd0d2e83 (diff)
downloadATCD-34261adcbda31b367d99dd0257274c526a25bb65.tar.gz
Mon Apr 11 12:28:21 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/dds4ccm.mpb: * MPC/config/dds4ccm_base.mpb: * MPC/config/dds4ccm_impl.mpb: * MPC/config/dds4ccm_ts_default.mpb: * MPC/config/ndds_idltocpp.mpb: * MPC/config/ndds_idltocpp_impl.mpb: * MPC/config/ndds_idltocpp_lem_stub.mpb: * MPC/config/ndds_idltocpp_skel.mpb: * MPC/config/ndds_idltocpp_stub.mpb: * MPC/config/ndds_idltocpp_ts_defaults.mpb: * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc: * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc: * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc: * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc: * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: * connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc: Renamed base projects to make a difference between plain RTI DDS (the ndds* base projects) and our IDL to CPP wrapper around RTI DDS (the ndds_idltocpp_* base projects) * MPC/config/ndds.mpb: * MPC/config/ndds_impl.mpb: * MPC/config/ndds_lem_stub.mpb: * MPC/config/ndds_skel.mpb: * MPC/config/ndds_stub.mpb: * MPC/config/ndds_ts_default.mpb: * connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc: * connectors/dds4ccm/idl/ndds/ndds_skel.mpc: * connectors/dds4ccm/idl/ndds/ndds_stub.mpc: * connectors/dds4ccm/impl/ndds/ndds.mpc: Removed these files.
Diffstat (limited to 'CIAO')
-rw-r--r--CIAO/ChangeLog37
-rw-r--r--CIAO/MPC/config/dds4ccm.mpb4
-rw-r--r--CIAO/MPC/config/dds4ccm_base.mpb5
-rw-r--r--CIAO/MPC/config/dds4ccm_impl.mpb3
-rw-r--r--CIAO/MPC/config/dds4ccm_ts_default.mpb2
-rw-r--r--CIAO/MPC/config/ndds_idltocpp.mpb (renamed from CIAO/MPC/config/ndds.mpb)0
-rw-r--r--CIAO/MPC/config/ndds_idltocpp_impl.mpb (renamed from CIAO/MPC/config/ndds_impl.mpb)2
-rw-r--r--CIAO/MPC/config/ndds_idltocpp_lem_stub.mpb (renamed from CIAO/MPC/config/ndds_lem_stub.mpb)2
-rw-r--r--CIAO/MPC/config/ndds_idltocpp_skel.mpb (renamed from CIAO/MPC/config/ndds_skel.mpb)2
-rw-r--r--CIAO/MPC/config/ndds_idltocpp_stub.mpb (renamed from CIAO/MPC/config/ndds_stub.mpb)2
-rw-r--r--CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb (renamed from CIAO/MPC/config/ndds_ts_default.mpb)2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc8
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc2
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc (renamed from CIAO/connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc)8
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc (renamed from CIAO/connectors/dds4ccm/idl/ndds/ndds_skel.mpc)2
-rw-r--r--CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc (renamed from CIAO/connectors/dds4ccm/idl/ndds/ndds_stub.mpc)4
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc (renamed from CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc)2
20 files changed, 62 insertions, 31 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 57bcb07623d..326bb489271 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,40 @@
+Mon Apr 11 12:28:21 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * MPC/config/dds4ccm.mpb:
+ * MPC/config/dds4ccm_base.mpb:
+ * MPC/config/dds4ccm_impl.mpb:
+ * MPC/config/dds4ccm_ts_default.mpb:
+ * MPC/config/ndds_idltocpp.mpb:
+ * MPC/config/ndds_idltocpp_impl.mpb:
+ * MPC/config/ndds_idltocpp_lem_stub.mpb:
+ * MPC/config/ndds_idltocpp_skel.mpb:
+ * MPC/config/ndds_idltocpp_stub.mpb:
+ * MPC/config/ndds_idltocpp_ts_defaults.mpb:
+ * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc:
+ * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc:
+ * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc:
+ * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc:
+ * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc:
+ * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc:
+ * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc:
+ * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc:
+ * connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc:
+ Renamed base projects to make a difference between plain RTI DDS (the
+ ndds* base projects) and our IDL to CPP wrapper around RTI DDS (the
+ ndds_idltocpp_* base projects)
+
+ * MPC/config/ndds.mpb:
+ * MPC/config/ndds_impl.mpb:
+ * MPC/config/ndds_lem_stub.mpb:
+ * MPC/config/ndds_skel.mpb:
+ * MPC/config/ndds_stub.mpb:
+ * MPC/config/ndds_ts_default.mpb:
+ * connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc:
+ * connectors/dds4ccm/idl/ndds/ndds_skel.mpc:
+ * connectors/dds4ccm/idl/ndds/ndds_stub.mpc:
+ * connectors/dds4ccm/impl/ndds/ndds.mpc:
+ Removed these files.
+
Mon Apr 11 10:11:47 UTC 2011 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp:
diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb
index 53b0a98b5da..4ef461ec9dc 100644
--- a/CIAO/MPC/config/dds4ccm.mpb
+++ b/CIAO/MPC/config/dds4ccm.mpb
@@ -20,9 +20,7 @@ feature(dds4ccm_splice) : taoidldefaults {
includes += $(CIAO_ROOT)/connectors/dds4ccm/idl
}
-feature(dds4ccm_ndds) : ndds {
- after += CIAO_NDDS_stub
- libs += CIAO_NDDS_stub
+feature(dds4ccm_ndds) : ndds_idltocpp_stub {
}
feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) {
diff --git a/CIAO/MPC/config/dds4ccm_base.mpb b/CIAO/MPC/config/dds4ccm_base.mpb
index 3d6d2e6538d..d1f2686e135 100644
--- a/CIAO/MPC/config/dds4ccm_base.mpb
+++ b/CIAO/MPC/config/dds4ccm_base.mpb
@@ -11,9 +11,8 @@ feature(dds4ccm_splice) : dds4ccm, ciao_connector_base {
libs += DDS4CCM_stub
}
-feature(dds4ccm_ndds) : ndds_lem_stub, ndds_impl, ciao_connector_base {
- after += DDS4CCM_stub DDS4CCM_lem_gen
- libs += DDS4CCM_stub
+feature(dds4ccm_ndds) : ndds_idltocpp_lem_stub, ndds_idltocpp_impl, ciao_connector_base {
+ after += DDS4CCM_lem_gen
}
feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) {
diff --git a/CIAO/MPC/config/dds4ccm_impl.mpb b/CIAO/MPC/config/dds4ccm_impl.mpb
index d5c312d8aae..e33a8fcec20 100644
--- a/CIAO/MPC/config/dds4ccm_impl.mpb
+++ b/CIAO/MPC/config/dds4ccm_impl.mpb
@@ -11,8 +11,7 @@ feature(dds4ccm_splice) : dds4ccm_skel, dds4ccm_lem_stub, dds4ccm_logger {
libs += CIAO_DDS4CCM_DDS_Impl
}
-feature(dds4ccm_ndds) : dds4ccm_skel, dds4ccm_lem_stub, dds4ccm_logger, nddslib, \
- ndds_impl {
+feature(dds4ccm_ndds) : dds4ccm_skel, dds4ccm_lem_stub, ndds_idltocpp_impl {
after += CIAO_DDS4CCM_DDS_Impl
libs += CIAO_DDS4CCM_DDS_Impl
}
diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb
index 0f65a16f6c0..86d91e7c04b 100644
--- a/CIAO/MPC/config/dds4ccm_ts_default.mpb
+++ b/CIAO/MPC/config/dds4ccm_ts_default.mpb
@@ -16,7 +16,7 @@ feature(dds4ccm_splice) : dds4ccm, splice_ts_defaults {
}
}
-feature(dds4ccm_ndds) : dds4ccm, ndds_ts_default {
+feature(dds4ccm_ndds) : dds4ccm, ndds_idltocpp_ts_defaults {
}
feature(!dds4ccm_opendds) {
diff --git a/CIAO/MPC/config/ndds.mpb b/CIAO/MPC/config/ndds_idltocpp.mpb
index eb6114b8de7..eb6114b8de7 100644
--- a/CIAO/MPC/config/ndds.mpb
+++ b/CIAO/MPC/config/ndds_idltocpp.mpb
diff --git a/CIAO/MPC/config/ndds_impl.mpb b/CIAO/MPC/config/ndds_idltocpp_impl.mpb
index c4a827dc889..6b2a9f8fee3 100644
--- a/CIAO/MPC/config/ndds_impl.mpb
+++ b/CIAO/MPC/config/ndds_idltocpp_impl.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project {
+project : ndds_idltocpp_stub, dds4ccm_logger {
after += CIAO_DDS4CCM_DDS_NDDS
libs += CIAO_DDS4CCM_DDS_NDDS
}
diff --git a/CIAO/MPC/config/ndds_lem_stub.mpb b/CIAO/MPC/config/ndds_idltocpp_lem_stub.mpb
index 9f066892ea7..1055ca7fc98 100644
--- a/CIAO/MPC/config/ndds_lem_stub.mpb
+++ b/CIAO/MPC/config/ndds_idltocpp_lem_stub.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : ndds_stub, ccm_session_stub {
+project : ndds_idltocpp_stub, ccm_session_stub {
libs += CIAO_NDDS_lem_stub
after += CIAO_NDDS_lem_stub
} \ No newline at end of file
diff --git a/CIAO/MPC/config/ndds_skel.mpb b/CIAO/MPC/config/ndds_idltocpp_skel.mpb
index a35469f9a9e..c4c57a68994 100644
--- a/CIAO/MPC/config/ndds_skel.mpb
+++ b/CIAO/MPC/config/ndds_idltocpp_skel.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : ndds_stub {
+project : ndds_idltocpp_stub {
libs += CIAO_NDDS_skel
after += CIAO_NDDS_skel
} \ No newline at end of file
diff --git a/CIAO/MPC/config/ndds_stub.mpb b/CIAO/MPC/config/ndds_idltocpp_stub.mpb
index 9df997419db..456e8e026d5 100644
--- a/CIAO/MPC/config/ndds_stub.mpb
+++ b/CIAO/MPC/config/ndds_idltocpp_stub.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : ndds, typecode {
+project : ndds_idltocpp, typecode {
includes += $(ACE_ROOT) $(CIAO_ROOT)
libs += CIAO_NDDS_stub
after += CIAO_NDDS_stub
diff --git a/CIAO/MPC/config/ndds_ts_default.mpb b/CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb
index 867171151b7..62022d105cf 100644
--- a/CIAO/MPC/config/ndds_ts_default.mpb
+++ b/CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb
@@ -3,7 +3,7 @@
project : ndds_cck_ts_defaults, nddslib, typecode {
Define_Custom(DDSGenerator) : NDDSTypeSupport {
- commandflags += -typeSequenceSuffix RTISeq -enableEscapeChar -verbosity 1 -I $(CIAO_ROOT)/connectors/dds4ccm/idl -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT)
+ commandflags += -typeSequenceSuffix RTISeq -verbosity 1 -I $(CIAO_ROOT)/connectors/dds4ccm/idl -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT)
keyword dds_ts_flags = commandflags
}
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
index abc7169aee8..6ce341653bd 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(I2C_ShapeType_idl_gen) : connectoridldefaults, ndds, ndds_stub {
+project(I2C_ShapeType_idl_gen) : connectoridldefaults, ndds_idltocpp_stub {
after += DDS4CCM_idl_gen
custom_only = 1
idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_STUB_Export \
@@ -12,7 +12,7 @@ project(I2C_ShapeType_idl_gen) : connectoridldefaults, ndds, ndds_stub {
}
}
-project(I2C_ShapeType_lem_gen) : ciaoidldefaults, ndds_stub {
+project(I2C_ShapeType_lem_gen) : ciaoidldefaults, ndds_idltocpp_stub {
custom_only = 1
after += I2C_ShapeType_idl_gen
idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_LEM_STUB_Export \
@@ -25,7 +25,7 @@ project(I2C_ShapeType_lem_gen) : ciaoidldefaults, ndds_stub {
}
}
-project(I2C_ShapeType_lem_stub) : ndds_lem_stub {
+project(I2C_ShapeType_lem_stub) : ndds_idltocpp_lem_stub {
after += I2C_ShapeType_lem_gen I2C_ShapeType_stub I2C_Shapes_Base_stub
libs += I2C_Shapes_Base_stub I2C_ShapeType_stub
libpaths += ../lib
@@ -51,7 +51,7 @@ project(I2C_ShapeType_lem_stub) : ndds_lem_stub {
}
}
-project(I2C_ShapeType_stub) : ndds_ts_default, ndds_stub {
+project(I2C_ShapeType_stub) : ndds_idltocpp_stub {
after += I2C_ShapeType_idl_gen I2C_Shapes_Base_stub
libs += I2C_Shapes_Base_stub
libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
index b2c2b0e94d6..9f1bf0333ba 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(I2C_Shapes_Base_stub) : taoidldefaults, ndds_ts_default {
+project(I2C_Shapes_Base_stub) : taoidldefaults, ndds_idltocpp_ts_defaults {
sharedname = I2C_Shapes_Base_stub
dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
index a5af3edbfbd..9fb8605a90b 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(I2C_Shapes_Common) : dds4ccm_logger, ndds_impl, ndds_stub, ndds_ts_default {
+project(I2C_Shapes_Common) : dds4ccm_logger, ndds_idltocpp_impl {
sharedname = I2C_Shapes_Common
dynamicflags += I2C_SHAPES_COMMON_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
index ee45c497ed8..67d449af618 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(*i2c_shapes_rec) : dds4ccm_logger, ndds_impl, ndds_stub, ndds_ts_default {
+project(*i2c_shapes_rec) : dds4ccm_logger, ndds_idltocpp_impl {
exename = I2C_Shapes_Receiver
after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
index 11d21507e42..d39c36677a3 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
@@ -1,6 +1,6 @@
// $Id$
-project(*i2c_shapes_sender) : dds4ccm_logger, ndds_impl, ndds_stub, ndds_ts_default {
+project(*i2c_shapes_sender) : dds4ccm_logger, ndds_idltocpp_impl, ndds_cck_ts_defaults {
exename = I2C_Shapes_Sender
after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
index 721bc353087..1a0dc70497c 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (CIAO_NDDS_lem_gen) : install, ndds, ciaoidldefaults {
+project (CIAO_NDDS_lem_gen) : install, ndds_idltocpp, ciaoidldefaults {
custom_only = 1
after += CIAO_NDDS_idl_gen
idlflags += -I$(CIAO_ROOT)/connectors \
@@ -17,10 +17,8 @@ project (CIAO_NDDS_lem_gen) : install, ndds, ciaoidldefaults {
}
}
-project (CIAO_NDDS_lem_stub) : install, ndds, ccm_lem_stub, ccm_session_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client {
- after += CIAO_NDDS_stub CIAO_NDDS_lem_gen
- libs += CIAO_NDDS_stub
- includes += $(CIAO_ROOT)/connectors
+project (CIAO_NDDS_lem_stub) : install, ndds_idltocpp_stub, ccm_lem_stub, ccm_session_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client {
+ after += CIAO_NDDS_lem_gen
sharedname = CIAO_NDDS_lem_stub
dynamicflags += NDDS_LEM_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
index 4908324e745..3ac0258877a 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_skel.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project (CIAO_NDDS_skel) : install, ndds_lem_stub, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant {
+project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant {
includes += $(CIAO_ROOT)/connectors
dynamicflags += NDDS_SKEL_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
index ef1adcaeb90..c57e5e28376 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
@@ -1,6 +1,6 @@
// $Id$
-project (CIAO_NDDS_idl_gen) : install, ndds, componentidldefaults {
+project (CIAO_NDDS_idl_gen) : install, ndds_idltocpp, componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=NDDS_STUB_Export \
-Wb,stub_export_include=ndds_stub_export.h \
@@ -17,7 +17,7 @@ project (CIAO_NDDS_idl_gen) : install, ndds, componentidldefaults {
}
}
-project (CIAO_NDDS_stub) : install, ndds, ccm_stub, ciaolib_with_idl, ciao_output, taolib {
+project (CIAO_NDDS_stub) : install, ndds_idltocpp, ccm_stub, ciaolib_with_idl, ciao_output, taolib {
after += CIAO_NDDS_idl_gen
includes += $(CIAO_ROOT)/connectors
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc
index bd2edd5907a..6994be18eb2 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(CIAO_DDS4CCM_DDS_NDDS) : install, ndds_lem_stub, taolib, \
+project(CIAO_DDS4CCM_DDS_NDDS) : install, ndds_idltocpp_stub, taolib, \
ciao_output, dds4ccm_logger, nddslib {
dynamicflags += DDS4CCM_DDS_NDDS_BUILD_DLL