ChangeLogTag: Tue Nov 2 09:43:18 2004 J.T. Conklin <jtc@acorntoolworks.com>

6 files changed, 22 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7806d705865..5327a5b90ba 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Tue Nov  2 09:43:18 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
+
+	  Changed FT_ReplicationManager project to inherit from core so
+	  that executable is installed.
+
+	* orbsvcs/FT_ReplicationManager/Makefile.am:
+	* orbsvcs/Fault_Detector/Makefile.am:
+	* orbsvcs/Fault_Notifier/Makefile.am:
+
+	  Updated to install executables.
+
+	* orbsvcs/orbsvcs/Makefile.am:
+
+	  Updated to omit Log/PersistantStore.cpp.
+
 Tue Nov  2 07:24:04 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index dfd27e69fe0..7892785ce31 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -11,7 +11,7 @@ project(*Lib): orbsvcslib, core, fault_tolerance, notification_skel, ftorb, port
   }
 }
 
-project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb {
+project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb, core {
   exename  = FT_ReplicationManager
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
index c033916bcff..7d156abde51 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
+++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
@@ -61,7 +61,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = FT_ReplicationManager
+bin_PROGRAMS = FT_ReplicationManager
 
 FT_ReplicationManager_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am
index f61903d0926..f05999275fb 100644
--- a/TAO/orbsvcs/Fault_Detector/Makefile.am
+++ b/TAO/orbsvcs/Fault_Detector/Makefile.am
@@ -10,7 +10,7 @@ TAO_BUILDDIR = $(top_builddir)
 if BUILD_ACE_UUID
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = Fault_Detector
+bin_PROGRAMS = Fault_Detector
 
 Fault_Detector_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am
index 68c4b852343..8c0c899723f 100644
--- a/TAO/orbsvcs/Fault_Notifier/Makefile.am
+++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am
@@ -10,7 +10,7 @@ TAO_BUILDDIR = $(top_builddir)
 if BUILD_ACE_UUID
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = Fault_Notifier
+bin_PROGRAMS = Fault_Notifier
 
 Fault_Notifier_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index e83abb16d04..62259c0106e 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -2662,8 +2662,7 @@ DsLogAdmin = \
   Log/LogRecordStore.cpp \
   Log/Log_Constraint_Interpreter.cpp \
   Log/Log_Constraint_Visitors.cpp \
-  Log/Log_i.cpp \
-  Log/PersistStore.cpp
+  Log/Log_i.cpp
 
 lib_LTLIBRARIES += libTAO_DsLogAdmin_Serv.la