diff options
Diffstat (limited to 'TAO/orbsvcs/Fault_Detector')
4 files changed, 20 insertions, 21 deletions
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index ef7637ddf64..30ba12055a6 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -14,8 +14,8 @@ #include "Fault_Detector_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" // Use this macro at the beginning of CORBA methods // to aid in debugging. diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h index ec7dd75f590..c9d5b8e6398 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h @@ -32,8 +32,8 @@ namespace TAO ///////////////////////////////// // Includes needed by this header #include <ace/Vector_T.h> -#include <orbsvcs/FT_FaultDetectorFactoryS.h> -#include <orbsvcs/FT_ReplicationManagerC.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryS.h> +#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h> #include <ace/Thread_Manager.h> ///////////////////// diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h index d5882ad1a15..9f5d76029cf 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h @@ -36,8 +36,8 @@ namespace TAO } -#include "orbsvcs/FT_NotifierC.h" -#include "orbsvcs/FT_ReplicaC.h" +#include "orbsvcs/orbsvcs/FT_NotifierC.h" +#include "orbsvcs/orbsvcs/FT_ReplicaC.h" #include "ace/Time_Value.h" diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am index f61903d0926..cb913c06ab4 100644 --- a/TAO/orbsvcs/Fault_Detector/Makefile.am +++ b/TAO/orbsvcs/Fault_Detector/Makefile.am @@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Fault_Detector.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - noinst_PROGRAMS = Fault_Detector Fault_Detector_CPPFLAGS = \ @@ -17,16 +14,12 @@ Fault_Detector_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_ROOT)/orbsvcs/orbsvcs Fault_Detector_SOURCES = \ - FT_FaultDetectorFactory_i.cpp \ - Fault_Detector_Main.cpp \ Fault_Detector_i.cpp \ - FT_FaultDetectorFactory_i.h \ - Fault_Detector_i.h + Fault_Detector_Main.cpp \ + FT_FaultDetectorFactory_i.cpp Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ @@ -35,17 +28,23 @@ Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID +noinst_HEADERS = \ + FT_FaultDetectorFactory_i.h \ + Fault_Detector_i.h ## Clean up template repositories, etc. clean-local: |