Thu Jun 17 08:06:31 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ports:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp:
          Reorganized the mpc files. Also created a consistent format of the mpc-files regarding
          the attributes like sharedname/includes.

14 files changed, 171 insertions, 97 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 864a19e4490..193055742c0 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,32 @@
+Thu Jun 17 08:06:31 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ports:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp:
+          Reorganized the mpc files. Also created a consistent format of the mpc-files regarding
+          the attributes like sharedname/includes.
+
 Thu Jun 17 07:58:29 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc
index ec4a8c47611..7650b3769e2 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc
@@ -10,12 +10,11 @@ project(ShapesControl_obj_idl_gen) : componentidldefaults {
               -Wb,svnt_export_include=ShapesControl_obj_svnt_export.h \
               -Wb,exec_export_macro=SHAPES_CONTROL_EXEC_Export \
               -Wb,exec_export_include=ShapesControl_obj_exec_export.h \
-              -I ../ports \
-              -I ports \
+              -I../../ports \
               -o GeneratedCode
 
   IDL_Files {
-    ports/ShapesControl_obj.idl
+    ShapesControl_obj.idl
     gendir = GeneratedCode
   }
 }
@@ -26,8 +25,7 @@ project(ShapesControl_obj_lem_gen) : ciaoidldefaults {
   idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_LEM_STUB_Export \
               -Wb,stub_export_include=ShapesControl_obj_lem_stub_export.h \
               -SS -Gxhst \
-              -I ../ports \
-              -I ports \
+              -I../../ports \
               -o GeneratedCode
 
   IDL_Files {
@@ -38,10 +36,13 @@ project(ShapesControl_obj_lem_gen) : ciaoidldefaults {
 
 project(ShapesControl_obj_lem_stub) : ccm_svnt {
   after += ShapesControl_obj_lem_gen ShapesControl_obj_stub
+
   libs  += ShapesControl_obj_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
   sharedname = ShapesControl_obj_lem_stub
   dynamicflags   = SHAPES_CONTROL_LEM_STUB_BUILD_DLL
 
@@ -64,10 +65,13 @@ project(ShapesControl_obj_lem_stub) : ccm_svnt {
 
 project(ShapesControl_obj_stub) : ccm_stub {
   after += ShapesControl_obj_idl_gen Shapes_defn_idl_gen Shapes_defn_stub
+
   libs  += Shapes_defn_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
   sharedname = ShapesControl_obj_stub
   dynamicflags = SHAPES_CONTROL_STUB_BUILD_DLL
 
@@ -92,12 +96,15 @@ project(ShapesControl_obj_stub) : ccm_stub {
 project(ShapesControl_obj_svnt) : ciao_servant {
   after      += ShapesControl_obj_lem_stub ShapesControl_obj_stub \
                 Shapes_defn_idl_gen Shapes_defn_stub
-  sharedname  = ShapesControl_obj_svnt
+
   libs       += ShapesControl_obj_stub ShapesControl_obj_lem_stub \
                 Shapes_defn_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
+  sharedname  = ShapesControl_obj_svnt
   dynamicflags = SHAPES_CONTROL_SVNT_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc
index 0326b8d4f6b..7b14d3d06ab 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc
@@ -11,12 +11,12 @@ project(ShapesControl_idl_gen) : componentidldefaults {
               -Wb,svnt_export_include=ShapesControl_svnt_export.h \
               -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \
               -Wb,exec_export_include=ShapesControl_exec_export.h \
-              -I./ports \
               -I../ports \
+              -I../../ports \
               -o GeneratedCode
 
   IDL_Files {
-    ./src/ShapesControl_comp.idl
+    ShapesControl_comp.idl
     gendir = GeneratedCode
   }
 }
@@ -27,11 +27,9 @@ project(ShapesControl_lem_gen) : ciaoidldefaults {
   idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_LEM_STUB_Export \
               -Wb,stub_export_include=ShapesControl_lem_stub_export.h \
               -SS -Gxhst \
-              -I./src \
-              -I./ports \
-              -I./GeneratedCode \
               -I../ports \
               -I../ports/GeneratedCode \
+              -I../../ports \
               -o GeneratedCode
 
   IDL_Files {
@@ -43,10 +41,13 @@ project(ShapesControl_lem_gen) : ciaoidldefaults {
 project(ShapesControl_lem_stub) : ccm_svnt {
   after += ShapesControl_lem_gen ShapesControl_stub Shapes_msg_stub \
            ShapesControl_obj_stub
+
   libs  += Shapes_msg_stub ShapesControl_stub ShapesControl_obj_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode ../ports/GeneratedCode
+
   sharedname = ShapesControl_lem_stub
   dynamicflags   = SHAPES_CONTROL_COMP_LEM_STUB_BUILD_DLL
 
@@ -70,10 +71,13 @@ project(ShapesControl_lem_stub) : ccm_svnt {
 project(ShapesControl_stub) : ccm_stub {
   after += ShapesControl_idl_gen Shapes_msg_stub \
            ShapesControl_obj_stub ShapesControl_obj_lem_stub
+
   libs  += Shapes_msg_stub ShapesControl_obj_stub
-  includes += ../ports/GeneratedCode
-  libpaths += ../lib
-  libout = ../lib
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode ../ports/GeneratedCode
+
   sharedname = ShapesControl_stub
   dynamicflags   = SHAPES_CONTROL_COMP_STUB_BUILD_DLL
 
@@ -97,12 +101,15 @@ project(ShapesControl_stub) : ccm_stub {
 project(ShapesControl_exec) : ciao_executor {
   after   += ShapesControl_lem_stub ShapesControl_stub \
              ShapesControl_obj_lem_stub
-  sharedname = ShapesControl_exec
+
   libs += ShapesControl_stub ShapesControl_lem_stub Shapes_msg_stub \
           ShapesControl_obj_lem_stub ShapesControl_obj_stub
-  libpaths += ../lib
-  includes +=  ./GeneratedCode ../ports/GeneratedCode
-  libout = ../lib
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
+
+  sharedname = ShapesControl_exec
   dynamicflags   = SHAPES_CONTROL_COMP_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -126,14 +133,17 @@ project(ShapesControl_svnt) : ciao_servant {
   after      += Shapes_msg_stub  ShapesControl_lem_stub \
                 ShapesControl_stub ShapesControl_obj_svnt \
                 ShapesControl_obj_lem_stub
-  sharedname  = ShapesControl_svnt
+
   libs       += ShapesControl_stub ShapesControl_lem_stub  \
                 Shapes_msg_stub \
                 ShapesControl_obj_stub ShapesControl_obj_svnt \
                 ShapesControl_obj_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../ports/GeneratedCode ../../ports/GeneratedCode
+
+  sharedname  = ShapesControl_svnt
   dynamicflags = SHAPES_CONTROL_COMP_SVNT_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp
index c58f5e37a20..c58f5e37a20 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h
index 2c1a8c96201..2c1a8c96201 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc
index c5b19c712a2..4d8f808cd11 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc
@@ -11,12 +11,11 @@ project(ShapesReceiver_idl_gen) : componentidldefaults, dds4ccm {
               -Wb,svnt_export_include=ShapesReceiver_svnt_export.h \
               -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \
               -Wb,exec_export_include=ShapesReceiver_exec_export.h \
-              -I ../ShapesSender_comp/ports \
-              -I ../ports \
+              -I../../ports \
               -o GeneratedCode
 
   IDL_Files {
-    src/ShapesReceiver_comp.idl
+    ShapesReceiver_comp.idl
     gendir = GeneratedCode
   }
 }
@@ -27,11 +26,8 @@ project(ShapesReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_LEM_STUB_Export \
               -Wb,stub_export_include=ShapesReceiver_lem_stub_export.h \
               -SS -Gxhst \
-              -I ../ShapesSender_comp/ports \
-              -I../ports/GeneratedCode \
-              -I../ShapesSender_comp/GeneratedCode \
-              -I src \
-              -I ../ports \
+              -I../../ports \
+              -I../../ports/GeneratedCode \
               -o GeneratedCode
 
   IDL_Files {
@@ -43,10 +39,13 @@ project(ShapesReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
 project(ShapesReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
   after += ShapesReceiver_lem_gen ShapesReceiver_stub  Shapes_conn_stub \
            Shapes_msg_stub
+
   libs  += ShapesReceiver_stub Shapes_conn_stub Shapes_msg_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode ../ShapesSender_comp/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
   sharedname = ShapesReceiver_lem_stub
   dynamicflags   = SHAPES_RECEIVER_COMP_LEM_STUB_BUILD_DLL
 
@@ -70,10 +69,13 @@ project(ShapesReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
 project(ShapesReceiver_stub) : ccm_stub, dds4ccm_base {
   after += ShapesReceiver_idl_gen Shapes_conn_stub \
            Shapes_msg_stub Shapes_conn_lem_gen
+
   libs  += Shapes_conn_stub Shapes_msg_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode ../ShapesSender_comp/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
   sharedname = ShapesReceiver_stub
   dynamicflags   = SHAPES_RECEIVER_COMP_STUB_BUILD_DLL
 
@@ -98,12 +100,15 @@ project(ShapesReceiver_exec) : ciao_executor, dds4ccm_base {
   after += ShapesReceiver_lem_stub ShapesReceiver_stub \
            Shapes_msg_stub Shapes_conn_stub Shapes_conn_lem_stub \
            DDS4CCM_lem_stub
-  sharedname = ShapesReceiver_exec
+
   libs += ShapesReceiver_stub ShapesReceiver_lem_stub Shapes_msg_stub \
           Shapes_conn_stub Shapes_conn_lem_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ./GeneratedCode ../ports/GeneratedCode ../ShapesSender_comp/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
+
+  sharedname = ShapesReceiver_exec
   dynamicflags   = SHAPES_RECEIVER_COMP_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -127,13 +132,16 @@ project(ShapesReceiver_svnt) : ciao_servant, dds4ccm_base {
   after      += ShapesReceiver_lem_stub Shapes_msg_stub \
                 Shapes_conn_stub Shapes_conn_svnt ShapesReceiver_exec \
                 Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
-  sharedname  = ShapesReceiver_svnt
+
   libs       += ShapesReceiver_stub ShapesReceiver_lem_stub Shapes_msg_stub \
                 Shapes_conn_stub Shapes_conn_svnt ShapesReceiver_exec \
                 Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode ../ShapesSender_comp/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../ports/GeneratedCode ../../ports/GeneratedCode
+
+  sharedname  = ShapesReceiver_svnt
   dynamicflags = SHAPES_RECEIVER_COMP_SVNT_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp
index f5860d3fe76..f5860d3fe76 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h
index e132abbe3b4..e132abbe3b4 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc
index 36361f2866d..537e5223698 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc
@@ -11,13 +11,12 @@ project(ShapesSender_idl_gen) : componentidldefaults, dds4ccm {
               -Wb,svnt_export_include=ShapesSender_svnt_export.h \
               -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \
               -Wb,exec_export_include=ShapesSender_exec_export.h \
-              -I./ports \
-              -I../ports \
-              -I../ShapesControl_comp/ports \
+              -I../../ports \
+              -I../../ShapesControl_comp/ports \
               -o GeneratedCode
 
   IDL_Files {
-    ./src/ShapesSender_comp.idl
+    ShapesSender_comp.idl
     gendir = GeneratedCode
   }
 }
@@ -28,13 +27,10 @@ project(ShapesSender_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_LEM_STUB_Export \
               -Wb,stub_export_include=ShapesSender_lem_stub_export.h \
               -SS -Gxhst -I $CIAO_ROOT/connectors \
-              -I./src \
-              -I./ports \
-              -I./GeneratedCode \
-              -I../ports \
-              -I../ports/GeneratedCode \
-              -I../ShapesControl_comp/ports \
-              -I../ShapesControl_comp/GeneratedCode \
+              -I../../ports \
+              -I../../ports/GeneratedCode \
+              -I../../ShapesControl_comp/ports \
+              -I../../ShapesControl_comp/ports/GeneratedCode \
               -o GeneratedCode
 
   IDL_Files {
@@ -45,12 +41,15 @@ project(ShapesSender_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(ShapesSender_lem_stub) : ccm_svnt, dds4ccm_base {
   after += ShapesSender_lem_gen ShapesSender_stub Shapes_msg_stub
+
   libs  += Shapes_msg_stub ShapesSender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode ../ShapesControl_comp/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode
+
   sharedname = ShapesSender_lem_stub
-  dynamicflags   = SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL
+  dynamicflags = SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL
 
   IDL_Files {
   }
@@ -71,10 +70,13 @@ project(ShapesSender_lem_stub) : ccm_svnt, dds4ccm_base {
 
 project(ShapesSender_stub) : ccm_stub, dds4ccm_base {
   after += ShapesSender_idl_gen Shapes_msg_stub Shapes_conn_stub
+
   libs  += Shapes_msg_stub Shapes_conn_stub
-  includes += ../ports/GeneratedCode  ../ShapesControl_comp/GeneratedCode
-  libpaths += ../lib
-  libout = ../lib
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode
+
   sharedname = ShapesSender_stub
   dynamicflags   = SHAPES_SENDER_COMP_STUB_BUILD_DLL
 
@@ -99,15 +101,17 @@ project(ShapesSender_exec) : ciao_executor, dds4ccm_base {
   after   += ShapesSender_lem_stub ShapesSender_stub Shapes_conn_lem_stub \
              Shapes_conn_stub ShapesControl_lem_stub ShapesControl_obj_lem_stub \
              Shapes_defn_stub ShapesControl_obj_stub
-  sharedname = ShapesSender_exec
+
   libs += ShapesSender_stub ShapesSender_lem_stub Shapes_msg_stub \
           Shapes_conn_lem_stub Shapes_conn_stub ShapesControl_lem_stub \
           ShapesControl_obj_lem_stub Shapes_defn_stub ShapesControl_obj_stub
-  libpaths += ../lib
-  includes +=  ./GeneratedCode \
-               ../ports/GeneratedCode \
-               ../ShapesControl_comp/GeneratedCode
-  libout = ../lib
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode \
+              ../../ShapesControl_comp/ports/GeneratedCode
+
+  sharedname = ShapesSender_exec
   dynamicflags   = SHAPES_SENDER_COMP_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -133,17 +137,20 @@ project(ShapesSender_svnt) : ciao_servant, dds4ccm_base {
                 Shapes_conn_lem_stub ShapesControl_svnt \
                 ShapesControl_obj_stub ShapesControl_obj_svnt \
                 ShapesControl_obj_lem_stub
-  sharedname  = ShapesSender_svnt
+
   libs       += ShapesSender_stub ShapesSender_lem_stub  \
                 Shapes_msg_stub DDS4CCM_lem_stub DDS4CCM_skel \
                 Shapes_conn_stub Shapes_conn_svnt \
                 Shapes_conn_lem_stub ShapesControl_svnt \
                 ShapesControl_obj_stub ShapesControl_obj_svnt \
                 ShapesControl_obj_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ../ports/GeneratedCode \
-              ../ShapesControl_comp/GeneratedCode
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../ports/GeneratedCode ../../ports/GeneratedCode \
+              ../../ShapesControl_comp/ports/GeneratedCode
+
+  sharedname  = ShapesSender_svnt
   dynamicflags = SHAPES_SENDER_COMP_SVNT_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp
index e451a61422e..e451a61422e 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h
index 02c2ce1157e..02c2ce1157e 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.mpc
index 551ab7fb61e..925a217a341 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.mpc
@@ -36,10 +36,13 @@ project(Shapes_conn_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(Shapes_conn_lem_stub) : ccm_svnt, dds4ccm_base {
   after += Shapes_conn_lem_gen Shapes_conn_stub Shapes_msg_stub DDS4CCM_lem_stub
+
   libs  += Shapes_msg_stub Shapes_conn_stub DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
+
   includes += .
+
   sharedname = Shapes_conn_lem_stub
   dynamicflags   = SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL
 
@@ -62,10 +65,13 @@ project(Shapes_conn_lem_stub) : ccm_svnt, dds4ccm_base {
 
 project(Shapes_conn_stub) : ccm_stub, dds4ccm_base {
   after += Shapes_conn_idl_gen Shapes_msg_stub
+
   libs  += Shapes_msg_stub
   libpaths += ../lib
   libout = ../lib
+
   includes += .
+
   sharedname = Shapes_conn_stub
   dynamicflags   = SHAPES_CONNECTOR_STUB_BUILD_DLL
 
@@ -88,11 +94,14 @@ project(Shapes_conn_stub) : ccm_stub, dds4ccm_base {
 
 project(Shapes_conn_exec) : ciao_executor, dds4ccm_impl {
   after   += Shapes_conn_lem_stub Shapes_conn_stub DDS4CCM_lem_stub
-  sharedname = Shapes_conn_exec
+
   libs += Shapes_conn_stub Shapes_conn_lem_stub Shapes_msg_stub DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
+
   includes += .
+
+  sharedname = Shapes_conn_exec
   dynamicflags   = SHAPES_CONNECTOR_CONN_BUILD_DLL
 
   IDL_Files {
@@ -113,16 +122,16 @@ project(Shapes_conn_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(Shapes_conn_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Shapes_conn_lem_stub Shapes_conn_exec Shapes_conn_stub DDS4CCM_lem_stub
-  sharedname  = Shapes_conn_svnt
-  libs       += Shapes_conn_stub \
-                Shapes_conn_lem_stub  \
-                Shapes_msg_stub \
-                Shapes_conn_exec \
-                DDS4CCM_lem_stub
+  after += Shapes_conn_lem_stub Shapes_conn_exec Shapes_conn_stub DDS4CCM_lem_stub
+
+  libs += Shapes_conn_stub Shapes_conn_lem_stub Shapes_msg_stub Shapes_conn_exec \
+          DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
+
   includes += .
+
+  sharedname  = Shapes_conn_svnt
   dynamicflags = SHAPES_CONNECTOR_SVNT_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
index 3edfa9faca1..9127e5810b0 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc
@@ -16,9 +16,12 @@ project(Shapes_defn_idl_gen) : taoidldefaults {
 
 project(Shapes_defn_stub) : ccm_stub {
   after += Shapes_defn_idl_gen
+
   libpaths += ../lib
   libout = ../lib
+
   includes += ./GeneratedCode
+
   sharedname = Shapes_defn_stub
   dynamicflags = SHAPES_CONTROL_STUB_BUILD_DLL
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc
index a34afa8a2ed..ec0ac5ab098 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc
@@ -1,15 +1,16 @@
 // $Id$
 
 project (Shapes_msg_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default, Shapes {
-  sharedname = Shapes_msg_stub
-  dynamicflags += SHAPES_MSG_STUB_BUILD_DLL
-  libout = ../lib
-
   idlflags += -SS -Sci \
               -Wb,stub_export_macro=SHAPES_MSG_STUB_Export \
               -Wb,stub_export_include=Shapes_msg_stub_export.h \
               -o GeneratedCode
 
+  libout = ../lib
+
+  sharedname = Shapes_msg_stub
+  dynamicflags += SHAPES_MSG_STUB_BUILD_DLL
+
   IDL_Files {
     idlflags += -Gxhst
     gendir = GeneratedCode