merge from head

2 files changed, 27 insertions, 0 deletions

diff --git a/modules/CIAO/NEWS b/modules/CIAO/NEWS
index 7832f4713a9..73f6f2d0496 100644
--- a/modules/CIAO/NEWS
+++ b/modules/CIAO/NEWS
@@ -64,6 +64,12 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.7.8 and CIAO-0.7.9
   If you need any of the full CCM features, set ccm_lw=0 in your
   default.features file.
 
+. Updated AMI4CCM naming and extended the test suite
+
+. DDS4CCM tests and examples now instantiate the CCM_DDS::Typed module which
+  gives us the DDS_Event and DDS_State connectors directly without requiring
+  the user to manually derive a connector from DDS_Event and/or DDS_State
+
 USER VISIBLE CHANGES BETWEEN CIAO-0.7.7 and CIAO-0.7.8
 =======================================================
 
diff --git a/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc b/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc
index 3cf10040be3..8b43fc1de97 100644
--- a/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc
+++ b/modules/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc
@@ -12,6 +12,10 @@ project(AMI4CCM_idl_gen) : install, componentidldefaults {
   IDL_Files {
     ami4ccm.idl
   }
+
+  specific {
+    install_dir = connectors/ami4ccm/ami4ccm
+  }
 }
 
 project (AMI4CCM_lem_gen) : install, ciaoidldefaults {
@@ -25,6 +29,10 @@ project (AMI4CCM_lem_gen) : install, ciaoidldefaults {
      idlflags += -Gxhst
      ami4ccmE.idl
   }
+
+  specific {
+    install_dir = connectors/ami4ccm/ami4ccm
+  }
 }
 
 project(AMI4CCM_stub) : install, ciao_lib, messaging, ccm_stub {
@@ -49,6 +57,10 @@ project(AMI4CCM_stub) : install, ciao_lib, messaging, ccm_stub {
 
   IDL_Files {
   }
+
+  specific {
+    install_dir = connectors/ami4ccm/ami4ccm
+  }
 }
 
 project (AMI4CCM_lem_stub) : install, ccm_lem_stub, ciao_lib, ciao_output, taolib, valuetype, ifr_client {
@@ -67,11 +79,16 @@ project (AMI4CCM_lem_stub) : install, ccm_lem_stub, ciao_lib, ciao_output, taoli
 
   Header_Files {
    ami4ccmEC.h
+   ami4ccm_lem_stub_export.h
   }
 
   Inline_Files {
    ami4ccmEC.inl
   }
+
+  specific {
+    install_dir = connectors/ami4ccm/ami4ccm
+  }
 }
 
 project (AMI4CCM_svnt) : install, ciao_servant, ciao_lib {
@@ -98,4 +115,8 @@ project (AMI4CCM_svnt) : install, ciao_servant, ciao_lib {
   Inline_Files {
     ami4ccmS.inl
   }
+
+  specific {
+    install_dir = connectors/ami4ccm/ami4ccm
+  }
 }