ChangeLogTag: Tue May 18 21:48:11 UTC 2010 Adam Mitz <mitza@ociweb.com>

4 files changed, 43 insertions, 9 deletions

diff --git a/CIAO/ccm/CCM_lem_stub.mpc b/CIAO/ccm/CCM_lem_stub.mpc
index 686e246cee4..f5e4c3ea8f7 100644
--- a/CIAO/ccm/CCM_lem_stub.mpc
+++ b/CIAO/ccm/CCM_lem_stub.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(CCM_lem_stub_idl) : ciaolib_with_idl, valuetype {
+project(CCM_lem_stub_idl) : install, ciaolib_with_idl, valuetype {
   idlflags   += -Wb,stub_export_include=CCM_LEM_Stub_Export.h
   idlflags   += -Wb,stub_export_macro=CCM_LEM_STUB_Export
   custom_only = 1
@@ -29,7 +29,7 @@ project(CCM_lem_stub_idl) : ciaolib_with_idl, valuetype {
 
 }
 
-project(CCM_lem_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client {
+project(CCM_lem_stub) : install, ciaolib_with_idl, ciao_output, valuetype, ifr_client {
   // This is necessary for MPC to pull in rules.ciao.GNU
   includes += $(CIAO_ROOT)
   dynamicflags = CCM_LEM_STUB_BUILD_DLL
@@ -38,6 +38,10 @@ project(CCM_lem_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client {
   IDL_Files {
   }
 
+  Header_Files {
+    CCM_LEM_Stub_Export.h
+  }
+
   Source_Files {
     CCM_CCMExceptionC.cpp
     CCM_ContextC.cpp
diff --git a/CIAO/ccm/CCM_stub.mpc b/CIAO/ccm/CCM_stub.mpc
index bf4a42933ce..1c5eeda0078 100644
--- a/CIAO/ccm/CCM_stub.mpc
+++ b/CIAO/ccm/CCM_stub.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(CCM_stub_idl) : ciaolib_with_idl, valuetype {
+project(CCM_stub_idl) : install, ciaolib_with_idl, valuetype {
   idlflags  += -Wb,stub_export_include=CCM_Stub_Export.h
   idlflags  += -Wb,stub_export_macro=CCM_Stub_Export
   idlflags  += -Wb,skel_export_include=CCM_Svnt_Export.h
@@ -49,7 +49,7 @@ project(CCM_stub_idl) : ciaolib_with_idl, valuetype {
 
 }
 
-project(CCM_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client {
+project(CCM_stub) : install, ciaolib_with_idl, ciao_output, valuetype, ifr_client {
   // This is necessary for MPC to pull in rules.ciao.GNU
   includes += $(CIAO_ROOT)
   dynamicflags = CCM_STUB_BUILD_DLL
@@ -57,6 +57,10 @@ project(CCM_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client {
   IDL_Files {
   }
 
+  Header_Files {
+    CCM_Stub_Export.h
+  }
+
   Source_Files {
     CCM_BaseC.cpp
     CCM_EventsC.cpp
@@ -78,4 +82,10 @@ project(CCM_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client {
     CCM_ExceptionsC.cpp
     ComponentsC.cpp
   }
+
+  verbatim(gnuace, postinstall) {
+"	mkdir -p $(INSTALL_PREFIX)/share/ciao/ccm"
+"	ln -sf $(INSTALL_PREFIX)/include/ccm/Components.idl $(INSTALL_PREFIX)/share/ciao/ccm"
+  }
+
 }
diff --git a/CIAO/ccm/CCM_svnt.mpc b/CIAO/ccm/CCM_svnt.mpc
index 72371b28ea7..346c8e1045d 100644
--- a/CIAO/ccm/CCM_svnt.mpc
+++ b/CIAO/ccm/CCM_svnt.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(CCM_svnt_idl) : ciaolib_with_idl, valuetype {
+project(CCM_svnt_idl) : install, ciaolib_with_idl, valuetype {
   idlflags   += -Wb,export_include=CCM_Svnt_Export.h
   idlflags   += -Wb,export_macro=CCM_Svnt_Export
   custom_only = 1
@@ -27,7 +27,7 @@ project(CCM_svnt_idl) : ciaolib_with_idl, valuetype {
 
 }
 
-project(CCM_svnt) : orbsvcslib, orbsvcs_output \
+project(CCM_svnt) : install, orbsvcslib, orbsvcs_output \
                            , portableserver \
                            , valuetype \
                            , ifr_client \
@@ -42,6 +42,13 @@ project(CCM_svnt) : orbsvcslib, orbsvcs_output \
   IDL_Files {
   }
 
+  Header_Files {
+    CCM_Svnt_Export.h
+    CCM_BaseS.h
+    CCM_CookieS.h
+    CCM_ExceptionsS.h
+  }
+
   Source_Files {
     CCM_TransactionC.cpp
     CosPersistentStateC.cpp
@@ -70,6 +77,7 @@ project(CCM_svnt) : orbsvcslib, orbsvcs_output \
     CCM_HomeFinderS.cpp
     CCM_NavigationS.cpp
     CCM_ReceptacleS.cpp
+    ComponentsS.cpp
   }
 }
 
diff --git a/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc b/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
index a8d6e640caa..1030bc83a94 100644
--- a/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
+++ b/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CCM_ComponentServer_IDL) : ciaoidldefaults, anytypecode {
+project(CCM_ComponentServer_IDL) : install, ciaoidldefaults, anytypecode {
   idlflags     += -Wb,stub_export_macro=DANCE_COMPONENTSERVER_STUB_Export \
                   -Wb,stub_export_include=DAnCE_ComponentServer_stub_export.h \
                   -Wb,skel_export_macro=DANCE_COMPONENTSERVER_SVNT_Export \
@@ -23,9 +23,13 @@ project(CCM_ComponentServer_IDL) : ciaoidldefaults, anytypecode {
     idlflags += -Ssi
     CCM_ComponentServer.idl
   }
+
+  specific {
+    install_dir = ccm/ComponentServer
+  }
 }
 
-project(CCM_ComponentServer_stub) : ciaolib_with_idl, ciao_output, messaging, ccm_stub, anytypecode, ciao_lib  {
+project(CCM_ComponentServer_stub) : install, ciaolib_with_idl, ciao_output, messaging, ccm_stub, anytypecode, ciao_lib  {
   dynamicflags = DANCE_COMPONENTSERVER_STUB_BUILD_DLL
   after += CCM_ComponentServer_IDL
 
@@ -43,9 +47,13 @@ project(CCM_ComponentServer_stub) : ciaolib_with_idl, ciao_output, messaging, cc
   }
   IDL_Files {
   }
+
+  specific {
+    install_dir = ccm/ComponentServer
+  }
 }
 
-project(CCM_ComponentServer_svnt) : ciaolib_with_idl, ciao_output, messaging, ccm_componentserver_stub,  anytypecode, ciao_lib  {
+project(CCM_ComponentServer_svnt) : install, ciaolib_with_idl, ciao_output, messaging, ccm_componentserver_stub,  anytypecode, ciao_lib  {
   dynamicflags = DANCE_COMPONENTSERVER_SVNT_BUILD_DLL
 
   Header_Files {
@@ -61,5 +69,9 @@ project(CCM_ComponentServer_svnt) : ciaolib_with_idl, ciao_output, messaging, cc
   }
   IDL_Files {
   }
+
+  specific {
+    install_dir = ccm/ComponentServer
+  }
 }