Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO

8 files changed, 20 insertions, 4 deletions

diff --git a/ACE/apps/Gateway/Peer/peer.mpc b/ACE/apps/Gateway/Peer/peer.mpc
index d2e6a0476c1..6e5aca8d84d 100644
--- a/ACE/apps/Gateway/Peer/peer.mpc
+++ b/ACE/apps/Gateway/Peer/peer.mpc
@@ -5,9 +5,6 @@ project(Gateway_Peer) :  ace_output, acelib {
     Options.cpp
     Peer.cpp
   }
-  Documentation_Files {
-    svc.conf
-  }
 }
 
 project(gateway_peerd) : aceexe {
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 5b1c4c7c794..b0f574049f6 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -13,7 +13,6 @@ project(Test_Output) : acelib, script {
   Resource_Files {
   }
   Script_Files {
-    run_test.pl
     run_test.lst
   }
 }
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index 6cbb9fae704..8175d935c06 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
@@ -9,4 +9,7 @@ project : orbsvcsexe, install, concurrency_serv, naming, utils, svc_utils {
   InstallData_Files {
     README
   }
+
+  Documentation_Files {
+  }
 }
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index cb473488432..9309367eff7 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
@@ -9,4 +9,7 @@ project : orbsvcsexe, install, naming, event_serv, svc_utils, iortable, messagin
   InstallData_Files {
     README
   }
+
+  Documentation_Files {
+  }
 }
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
index a2a8d8de9bb..e28bd7f2084 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
@@ -8,4 +8,7 @@ project: namingexe, iortable, install, dslogadmin_serv, valuetype {
   InstallData_Files {
     README
   }
+
+  Documentation_Files {
+  }
 }
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 731d6735299..2e28b7b03d0 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -27,6 +27,9 @@ project(Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monito
   InstallData_Files {
     README
   }
+
+  Documentation_Files {
+  }
 }
 
 project(NT_Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monitor_control {
@@ -44,4 +47,6 @@ project(NT_Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_mon
     gendir = tao-notify
     README
   }
+  Documentation_Files {
+  }
 }
diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc
index 0ac011e7c1b..111724109a1 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service.mpc
+++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc
@@ -13,6 +13,9 @@ project(Time_Service_Server) : orbsvcsexe, install, time_serv, naming, utils, av
   InstallData_Files {
     README
   }
+
+  Documentation_Files {
+  }
 }
 
 project(Time_Service_Clerk) : orbsvcsexe, install, time_serv, naming, utils, avoids_corba_e_micro {
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
index 1e8942ef415..ae7514ba5d0 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
@@ -9,5 +9,8 @@ project : orbsvcsexe, utils, install, naming, trading_serv {
   InstallData_Files {
     README
   }
+
+  Documentation_Files {
+  }
 }