1 files changed, 13 insertions, 13 deletions
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
index afa92e6a20c..fb33537a552 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l .. -o ../lib -u DDS Perf_Keyed_Test_Connector"
 
-project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Perf_Keyed_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=PERF_KEYED_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Perf_Keyed_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PERF_KEYED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Perf_Keyed_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=PERF_KEYED_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Perf_Keyed_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_Perf_Keyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_LEM_STUB_Export \
@@ -32,7 +32,7 @@ project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
+project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
   after += DDS_Perf_Keyed_Test_Connector_lem_gen DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub DDS4CCM_lem_stub
   libs  += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub
   libpaths += ../lib
@@ -58,7 +58,7 @@ project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
+project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base   {
   after += DDS_Perf_Keyed_Test_Connector_idl_gen DDS_Perf_Keyed_Test_Base_stub
   libs  += DDS_Perf_Keyed_Test_Base_stub
   libpaths += ../lib
@@ -85,24 +85,24 @@ project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub
+  after   += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Perf_Keyed_Test_Base_NDDS_TS
   sharedname = DDS_Perf_Keyed_Test_Connector_exec
-  libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub DDS4CCM_lem_stub
+  libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_Perf_Keyed_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = PERF_KEYED_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = PERF_KEYED_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Perf_Keyed_Test_Connector_conn.cpp
+    Perf_Keyed_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    Perf_Keyed_Test_Connector_conn.h
-    Perf_Keyed_Test_Connector_conn_export.h
+    Perf_Keyed_Test_Connector_exec.h
+    Perf_Keyed_Test_Connector_exec_export.h
   }
 
   Inline_Files {
@@ -110,7 +110,7 @@ project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 }
 
 
-project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel {
+project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
   after      += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_exec DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub
   sharedname  = DDS_Perf_Keyed_Test_Connector_svnt
   libs       += DDS_Perf_Keyed_Test_Connector_stub \