Thu Jul 29 13:44:34 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * DAnCE/DAnCE/DAnCE_Core.mpc:
        * DAnCE/DAnCE/DAnCE_Utility.h:
        * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc:
        * DAnCE/LocalityManager/Scheduler/Scheduler.mpc:

          Attempt at some install fixes.

5 files changed, 49 insertions, 8 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e0e6c4784a3..b000cd0b120 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jul 29 13:44:34 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/DAnCE/DAnCE_Core.mpc:
+        * DAnCE/DAnCE/DAnCE_Utility.h:
+        * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc:
+        * DAnCE/LocalityManager/Scheduler/Scheduler.mpc:
+
+          Attempt at some install fixes.
+
 Thu Jul 29 12:33:37 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * CIAO-INSTALL.html:
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_Core.mpc b/CIAO/DAnCE/DAnCE/DAnCE_Core.mpc
index c993b437d09..62d901f25b7 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_Core.mpc
+++ b/CIAO/DAnCE/DAnCE/DAnCE_Core.mpc
@@ -26,7 +26,7 @@ project(DAnCE_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream, \
 
 project (DAnCE_stub) : ciaolib_with_idl, dance_output, \
          dance_applicationmanager_stub, dance_deployment_stub, \
-	 dance_logger \
+	 dance_logger, install \
 {
   after += DAnCE_IDL
   dynamicflags += DANCE_STUB_BUILD_DLL
@@ -41,10 +41,23 @@ project (DAnCE_stub) : ciaolib_with_idl, dance_output, \
     DAnCE_Utility.cpp
     DAnCE_DeploymentInterceptors_Base_Impl.cpp
   }
+
+  Header_Files {
+    DAnCE_Utility.h
+    DAnCE_stub_export.h
+    DAnCE_DeploymentInterceptorsC.h
+    DAnCE_PropertiesC.h
+    DAnCE_LocalityManagerC.h
+    DAnCE_ArtifactInstallationC.h
+  }
+
+  Template_Files {
+    DAnCE_Utility.tpp
+  }
 }
 
 project (DAnCE_skel) : ciaolib_with_idl, dance_output, dance_stub, \
-         dance_applicationmanager_skel, dance_deployment_skel \
+         dance_applicationmanager_skel, dance_deployment_skel, install   \
 {
   dynamicflags += DANCE_SKEL_BUILD_DLL
   IDL_Files {
@@ -54,4 +67,10 @@ project (DAnCE_skel) : ciaolib_with_idl, dance_output, dance_stub, \
     DAnCE_LocalityManagerS.cpp
     DAnCE_ArtifactInstallationS.cpp
   }
+
+  Header_Files {
+    DAnCE_LocalityManagerS.h
+    DAnCE_ArtifactInstallationS.h
+    DAnCE_skel_export.h
+  }
 }
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_Utility.h b/CIAO/DAnCE/DAnCE/DAnCE_Utility.h
index 1a3eb47f45a..3979a2cb0f2 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_Utility.h
+++ b/CIAO/DAnCE/DAnCE/DAnCE_Utility.h
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "DAnCE_stub_export.h"
+#include "DAnCE/DAnCE_stub_export.h"
 
 #include "ace/config-all.h"
 #include "ace/Hash_Map_Manager_T.h"
@@ -137,11 +137,11 @@ namespace DAnCE
 
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "DAnCE_Utility.tpp"
+#include "DAnCE/DAnCE_Utility.tpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DAnCE_Utility.tpp")
+#pragma implementation ("DAnCE/DAnCE_Utility.tpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 
diff --git a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc
index 94ae9f38250..e499287437f 100644
--- a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc
+++ b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc
@@ -1,7 +1,8 @@
 // $Id$
 
 project (DAnCE_LocalityManager_Impl) : dance_lib, dance_output, naming, \
-        dance_skel, dance_logger, dance_deployment_scheduler, dance_deployment_scheduler {
+        dance_skel, dance_logger, dance_deployment_scheduler, dance_deployment_scheduler, \
+        install {
 
    dynamicflags += LOCALITY_MANAGER_IMPL_BUILD_DLL
 
@@ -17,6 +18,10 @@ project (DAnCE_LocalityManager_Impl) : dance_lib, dance_output, naming, \
    specific {
      install_dir = DAnCE/LocalityManager/Daemon
    }
+  verbatim(gnuace, postinstall) {
+"	$(MKDIR) $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Daemon"
+"	cp  Locality_Manager_Impl.h $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Daemon/"
+  }
 }
 
 project (DAnCE_LocalityManager_Exec) : dance_exe, dance_exe, dance_output, \
@@ -36,6 +41,7 @@ project (DAnCE_LocalityManager_Exec) : dance_exe, dance_exe, dance_output, \
   verbatim(gnuace, postinstall) {
 "	$(MKDIR) $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Daemon"
 "	cp  Locality_Manager_Task.cpp $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Daemon/"
+"	cp  Locality_Manager_Task.h $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Daemon/"
 "	cp  Locality_Manager.cpp $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Daemon/"
   }
 }
diff --git a/CIAO/DAnCE/LocalityManager/Scheduler/Scheduler.mpc b/CIAO/DAnCE/LocalityManager/Scheduler/Scheduler.mpc
index f3adbf5f6ff..124fba55076 100644
--- a/CIAO/DAnCE/LocalityManager/Scheduler/Scheduler.mpc
+++ b/CIAO/DAnCE/LocalityManager/Scheduler/Scheduler.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(DAnCE_Deployment_Scheduler) : dance_lib, dance_output, dance_skel, dance_logger {
+project(DAnCE_Deployment_Scheduler) : dance_lib, dance_output, dance_skel, dance_logger, install {
   dynamicflags += DEPLOYMENT_SCHEDULER_BUILD_DLL
  
   includes += $(DANCE_ROOT)/tools
@@ -39,4 +39,11 @@ project(DAnCE_Deployment_Scheduler) : dance_lib, dance_output, dance_skel, dance
   specific {
     install_dir = DAnCE/LocalityManager/Scheduler
   }
-}
\ No newline at end of file
+
+  verbatim(gnuace, postinstall) {
+"	$(MKDIR) $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Scheduler"
+"	cp  Deployment_Scheduler.h $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Scheduler/"
+"	cp  Deployment_Event.h $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Scheduler/"
+"	cp  Deployment_Scheduler_export.h $(INSTALL_PREFIX)/share/DAnCE/LocalityManager/Scheduler/"
+  }
+}