From 3058028dfbc175175aa8d0f5be35a2f281deab5a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 14 Apr 2011 10:02:18 +0000 Subject: Thu Apr 14 10:01:01 UTC 2011 Johnny Willemsen * MPC/config/dds4ccm_impl.mpb: * MPC/config/ndds_idltocpp.mpb: * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb: Improved portability --- CIAO/ChangeLog | 7 +++++++ CIAO/MPC/config/dds4ccm_impl.mpb | 10 ++++++++-- CIAO/MPC/config/ndds_idltocpp.mpb | 4 +--- .../dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb | 4 ++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index b8c6a6e86d8..e692408a870 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Apr 14 10:01:01 UTC 2011 Johnny Willemsen + + * MPC/config/dds4ccm_impl.mpb: + * MPC/config/ndds_idltocpp.mpb: + * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb: + Improved portability + Thu Apr 14 09:29:54 UTC 2011 Johnny Willemsen * MPC/config/dds4ccm_impl.mpb: diff --git a/CIAO/MPC/config/dds4ccm_impl.mpb b/CIAO/MPC/config/dds4ccm_impl.mpb index f9c1523a5d2..73f735106ed 100644 --- a/CIAO/MPC/config/dds4ccm_impl.mpb +++ b/CIAO/MPC/config/dds4ccm_impl.mpb @@ -1,19 +1,25 @@ // -*- MPC -*- // $Id$ -feature(dds4ccm_opendds) : dds4ccm_skel, dds4ccm_lem_stub, dds4ccm_logger, dcps { +feature(dds4ccm_opendds) : dds4ccm_skel, dds4ccm_lem_stub, dcps { after += CIAO_DDS4CCM_DDS_Impl libs += CIAO_DDS4CCM_DDS_Impl + includes += $(CIAO_ROOT)/connectors \ + $(CIAO_ROOT)/connectors/dds4ccm/idl } -feature(dds4ccm_splice) : dds4ccm_skel, dds4ccm_lem_stub, dds4ccm_logger { +feature(dds4ccm_splice) : dds4ccm_skel, dds4ccm_lem_stub { after += CIAO_DDS4CCM_DDS_Impl libs += CIAO_DDS4CCM_DDS_Impl + includes += $(CIAO_ROOT)/connectors \ + $(CIAO_ROOT)/connectors/dds4ccm/idl } feature(dds4ccm_ndds) : dds4ccm_skel, dds4ccm_lem_stub, ndds_idltocpp_impl, ndds_idltocpp_lem_stub { after += CIAO_DDS4CCM_DDS_Impl libs += CIAO_DDS4CCM_DDS_Impl + includes += $(CIAO_ROOT)/connectors \ + $(CIAO_ROOT)/connectors/dds4ccm/idl } feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) { diff --git a/CIAO/MPC/config/ndds_idltocpp.mpb b/CIAO/MPC/config/ndds_idltocpp.mpb index eb6114b8de7..9637d7b94fb 100644 --- a/CIAO/MPC/config/ndds_idltocpp.mpb +++ b/CIAO/MPC/config/ndds_idltocpp.mpb @@ -9,7 +9,5 @@ project : nddslib, nddsmonitor, taoidldefaults { -I $(CIAO_ROOT)/connectors \ -I $(CIAO_ROOT)/connectors/dds4ccm/idl \ -I $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds - includes += $(CIAO_ROOT)/connectors/dds4ccm/idl \ - $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds \ - $(CIAO_ROOT)/connectors + includes += $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds } diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb index 8b47d8c5af0..006fdee383e 100644 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb +++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb @@ -3,3 +3,7 @@ feature (dds4ccm_ndds) { dds_ts_flags += -d Connector } + +feature (dds4ccm_opendds) { + dds_ts_flags += -o Connector +} -- cgit v1.2.1