Fri Jan 20 10:08:02 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * 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:
          Reduced the amount of files being generated

4 files changed, 11 insertions, 7 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 0ce8e793c2a..94188eb7ced 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jan 20 10:08:02 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * 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:
+          Reduced the amount of files being generated
+
 Fri Jan 20 09:58:21 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc:
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
index ff39d52a23f..bf17a2fc25c 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
@@ -5,7 +5,7 @@ project (CIAO_NDDS_lem_gen) : install, ndds_idltocpp, ciaoidldefaults {
   after += CIAO_NDDS_idl_gen
   idlflags += -I$(CIAO_ROOT)/connectors \
               -Wb,stub_export_macro=NDDS_LEM_STUB_Export \
-              -Wb,stub_export_include=ndds_lem_stub_export.h -SS
+              -Wb,stub_export_include=ndds_lem_stub_export.h -SS -Sci
 
   IDL_Files {
      idlflags += -Gxhst
@@ -13,6 +13,7 @@ project (CIAO_NDDS_lem_gen) : install, ndds_idltocpp, ciaoidldefaults {
   }
 
   IDL_Files {
+     idlflags += -Scc
      ndds_dcps_i_handleE.idl
   }
 
@@ -31,7 +32,6 @@ project (CIAO_NDDS_lem_stub) : install, ndds_idltocpp_stub, ccm_lem_stub, ccm_se
 
   Source_Files {
    ndds_dcpsEC.cpp
-   ndds_dcps_i_handleEC.cpp
   }
 
   Header_Files {
@@ -41,8 +41,6 @@ project (CIAO_NDDS_lem_stub) : install, ndds_idltocpp_stub, ccm_lem_stub, ccm_se
   }
 
   Inline_Files {
-   ndds_dcpsEC.inl
-   ndds_dcps_i_handleEC.inl
   }
 
   specific {
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
index b353927b2f9..b5c26213e38 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
@@ -16,7 +16,6 @@ project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_o
 
   Source_Files {
     ndds_dcpsS.cpp
-    ndds_dcps_i_handleS.cpp
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
index 1d9f8d0ebb9..4512ef46753 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
@@ -6,14 +6,14 @@ project (CIAO_NDDS_idl_gen) : install, ndds_idltocpp, componentidldefaults {
               -Wb,stub_export_include=ndds_stub_export.h \
               -Wb,skel_export_macro=NDDS_SKEL_Export \
               -Wb,skel_export_include=ndds_skel_export.h \
-              -I$(CIAO_ROOT)/connectors -Glem
+              -I$(CIAO_ROOT)/connectors -Glem -Ssvcp -Ssvtp
 
   IDL_Files {
     ndds_dcps.idl
   }
 
   IDL_Files {
-    idlflags -= -Gxhst -Gxhsk
+    idlflags -= -Gxhst -Gxhsk -SS
     ndds_dcps_i_handle.idl
   }