diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-01-22 18:01:53 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-01-22 18:01:53 +0000 |
| commit | 6c2d29e4fcde1218fb43fd11a26f622d3ccd9067 (patch) | |
| tree | 393567862ed0e4422ea66583bad80d40ad479c14 | |
| parent | 3d851691907129880880bf9bd420df90a47adb4b (diff) | |
| download | ATCD-6c2d29e4fcde1218fb43fd11a26f622d3ccd9067.tar.gz | |
Sun Jan 22 18:01:27 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc:
* connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc:
Install fixes
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc | 2 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc | 11 |
3 files changed, 13 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index f3824a74daa..0c941540d29 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Sun Jan 22 18:01:27 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc: + * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: + Install fixes + Sat Jan 21 14:40:46 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc index b5c26213e38..40c48158eda 100644 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc @@ -5,6 +5,7 @@ project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_o includes += $(CIAO_ROOT)/connectors dynamicflags += NDDS_SKEL_BUILD_DLL + IDL_Files { } @@ -12,6 +13,7 @@ project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_o ndds_skel_export.h ndds_dcpsS.h ndds_dcps_i_handleS.h + ndds_dcps_instance_handleS.h } Source_Files { diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc index 637430b31e7..7cf0cf1e5f7 100644 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc @@ -32,12 +32,17 @@ project (CIAO_NDDS_stub) : install, ndds_idltocpp, ccm_stub, ciaolib_with_idl, c IDL_Files { } + PIDL_Files { + ndds_dcps_instance_handle.idl + } + Header_Files { ndds_stub_export.h ndds_dscp_svnt.h ndds_dcpsC.h ndds_dcps_i_handleC.h ndds_dcps_instance_handleC.h + ndds_dcps_instance_handleEC.h } Source_Files { @@ -54,12 +59,6 @@ project (CIAO_NDDS_stub) : install, ndds_idltocpp, ccm_stub, ciaolib_with_idl, c specific { install_dir = connectors/dds4ccm/idl/ndds } - - verbatim(gnuace, postinstall) { -" cp ndds_dcps_instance_handle.idl $(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/" -" cp ndds_dcps_instance_handle*.h $(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/" - } - } project (CIAO_NDDS_idl_install_only) { |