diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/Event_Connection_Test')
2 files changed, 10 insertions, 63 deletions
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 1f7085ef55e..a7e75c673cd 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,75 +1,22 @@ // $Id$ -project(DDS_ECT_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_ECT_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=EVENT_CONNECTION_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Event_Connection_Test_Base_stub_export.h IDL_Files { Event_Connection_Test_Base.idl } -} -project(DDS_ECT_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_ECT_Base_idl_gen + opendds_ts_flags += --export=EVENT_CONNECTION_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Event_Connection_Test_Base.idl } } -project(DDS_ECT_Base_NDDS_TS) : nddslib, taolib { - after += DDS_ECT_Base_ndds_ts_gen DDS_ECT_Base_stub - libs += DDS_ECT_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_ECT_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Event_Connection_Test_Base.cxx - Event_Connection_Test_BasePlugin.cxx - Event_Connection_Test_BaseSupport.cxx - } - - Header_Files { - Event_Connection_Test_Base.h - Event_Connection_Test_BasePlugin.h - Event_Connection_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_ECT_Base_stub) : ccm_stub { - after += DDS_ECT_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_ECT_Base_stub - dynamicflags = EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_BaseC.cpp - } - - Header_Files { - Event_Connection_Test_BaseC.h - Event_Connection_Test_Base_stub_export.h - } - - Inline_Files { - Event_Connection_Test_BaseC.inl - } -} - 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 07fb60e28cc..2e9a9e6ae90 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 @@ -85,9 +85,9 @@ project(DDS_ECT_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_ECT_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub DDS4CCM_lem_stub DDS_ECT_Base_NDDS_TS + after += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub DDS4CCM_lem_stub sharedname = DDS_ECT_Connector_exec - libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub DDS4CCM_lem_stub DDS_ECT_Base_NDDS_TS + libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. |