summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog51
-rw-r--r--TAO/configure.ac24
-rw-r--r--TAO/orbsvcs/Concurrency_Service/Makefile.am54
-rw-r--r--TAO/orbsvcs/CosEvent_Service/Makefile.am60
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Makefile.am55
-rw-r--r--TAO/orbsvcs/Event_Service/Makefile.am62
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am52
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am51
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am46
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Makefile.am7
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/Makefile.am105
-rw-r--r--TAO/orbsvcs/Fault_Detector/Makefile.am53
-rw-r--r--TAO/orbsvcs/Fault_Notifier/Makefile.am51
-rw-r--r--TAO/orbsvcs/IFR_Service/Makefile.am222
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Makefile.am68
-rw-r--r--TAO/orbsvcs/LoadBalancer/Makefile.am82
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am46
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am51
-rw-r--r--TAO/orbsvcs/Logging_Service/Makefile.am8
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am54
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am50
-rw-r--r--TAO/orbsvcs/Makefile.am52
-rw-r--r--TAO/orbsvcs/Naming_Service/Makefile.am86
-rw-r--r--TAO/orbsvcs/Notify_Service/Makefile.am80
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Makefile.am57
-rw-r--r--TAO/orbsvcs/Time_Service/Makefile.am93
-rw-r--r--TAO/orbsvcs/Trading_Service/Makefile.am59
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile.am118
28 files changed, 1336 insertions, 461 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b4c82fe1b59..a820bbd404c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,56 @@
+Tue Aug 3 17:08:38 2004 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * orbsvcs/orbsvcs/Makefile.am:
+ Removed duplicate rules for building CosEventComm and
+ CosEventChannelAdmin IDL files.
+ Changed to not install headers, at least for the time
+ being.
+
+ * orbsvcs/FTRT_Event_Service/Makefile.am:
+ * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
+ * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
+ * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
+ * orbsvcs/FT_ReplicationManager/Makefile.am:
+ * orbsvcs/Fault_Detector/Makefile.am:
+ * orbsvcs/Fault_Notifier/Makefile.am:
+ * orbsvcs/LoadBalancer/Makefile.am:
+ * orbsvcs/Logging_Service/Makefile.am:
+ * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
+ * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
+ * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
+ * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+ * orbsvcs/Notify_Service/Makefile.am:
+ New file.
+
+ * orbsvcs/Concurrency_Service/Makefile.am:
+ * orbsvcs/CosEvent_Service/Makefile.am:
+ * orbsvcs/Dump_Schedule/Makefile.am:
+ * orbsvcs/Event_Service/Makefile.am:
+ * orbsvcs/IFR_Service/Makefile.am:
+ * orbsvcs/LifeCycle_Service/Makefile.am:
+ * orbsvcs/Naming_Service/Makefile.am:
+ * orbsvcs/Scheduling_Service/Makefile.am:
+ * orbsvcs/Time_Service/Makefile.am:
+ * orbsvcs/Trading_Service/Makefile.am:
+ Update, with a little help from MPC.
+
+ * orbsvcs/Makefile.am:
+ Added Concurrency, CosEvent, Dump Schedule, Event, Fault
+ Detector, Fault Notifier, FT Replication Manager, FTRT Event,
+ IFR, LifeCycle, Load Balancer, Logging, Naming, Notify,
+ Scheduling, Time, and Trading services to list of SUBDIRS.
+
+ * configure.ac:
+ Added Concurrency, CosEvent, Dump Schedule, Event, Fault
+ Detector, Fault Notifier, FT Replication Manager, FTRT Event,
+ IFR, LifeCycle, Load Balancer, Logging, Naming, Notify,
+ Scheduling, Time, and Trading service Makefile.am's to list of
+ config files.
+
Tue Aug 3 16:32:56 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/be/be_interface.cpp:
-
+
Made the checking more strict for enqueueing abstract
interfaces to an internally used list - abstract
valuetypes and eventtypes were also getting put on it,
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 5dffb4cfdc6..44fbdabdd0d 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -167,9 +167,33 @@ AC_CONFIG_FILES([
Makefile
TAO_IDL/Makefile
tao/Makefile
+ orbsvcs/Concurrency_Service/Makefile
+ orbsvcs/CosEvent_Service/Makefile
+ orbsvcs/Dump_Schedule/Makefile
+ orbsvcs/Event_Service/Makefile
+ orbsvcs/FTRT_Event_Service/Event_Service/Makefile
+ orbsvcs/FTRT_Event_Service/Factory_Service/Makefile
+ orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile
+ orbsvcs/FTRT_Event_Service/Makefile
+ orbsvcs/FT_ReplicationManager/Makefile
+ orbsvcs/Fault_Detector/Makefile
+ orbsvcs/Fault_Notifier/Makefile
+ orbsvcs/IFR_Service/Makefile
+ orbsvcs/LifeCycle_Service/Makefile
+ orbsvcs/LoadBalancer/Makefile
+ orbsvcs/Logging_Service/Basic_Logging_Service/Makefile
+ orbsvcs/Logging_Service/Event_Logging_Service/Makefile
+ orbsvcs/Logging_Service/Makefile
+ orbsvcs/Logging_Service/Notify_Logging_Service/Makefile
+ orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile
orbsvcs/Makefile
+ orbsvcs/Naming_Service/Makefile
+ orbsvcs/Notify_Service/Makefile
orbsvcs/PSS/Makefile
+ orbsvcs/Scheduling_Service/Makefile
orbsvcs/TAO_Service/Makefile
+ orbsvcs/Time_Service/Makefile
+ orbsvcs/Trading_Service/Makefile
orbsvcs/orbsvcs/Makefile
])
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
index 083ebfe5f1c..52cb1706816 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile.am
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am
@@ -1,36 +1,42 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's Concurrency Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.Concurrency_Service.am
-bin_PROGRAMS = Concurrency_Service
+noinst_PROGRAMS = Concurrency_Service
-Concurrency_Service_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+Concurrency_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
Concurrency_Service_SOURCES = \
- Concurrency_Service.cpp
+ Concurrency_Service.cpp
-noinst_HEADERS = \
- Concurrency_Service.h
+Concurrency_Service_LDADD = \
+ $(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)/orbsvcs/orbsvcs/libTAO_CosConcurrency.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
-EXTRA_DIST = README
+noinst_HEADERS = \
+ Concurrency_Service.h
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am
index 570da71b2d3..64ad6907473 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.am
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am
@@ -1,36 +1,44 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's CosEvent Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.CosEvent_Service.am
-bin_PROGRAMS = CosEvent_Service
+noinst_PROGRAMS = CosEvent_Service
-CosEvent_Service_LDADD = \
- $(top_builddir)/ace/libACE.la \
- $(top_builddir)/TAO/tao/libTAO.la \
- $(top_builddir)/TAO/tao/libTAO_CosEvent.la \
- $(top_builddir)/TAO/tao/libTAO_Svc_Utils.la
+CosEvent_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs \
+ -DTAO_HAS_TYPED_EVENT_CHANNEL \
+ $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH)
CosEvent_Service_SOURCES = \
- CosEvent_Service.cpp
-
-EXTRA_DIST = README
+ CosEvent_Service.cpp
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+CosEvent_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.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
+
+
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am
index 80ae24e06b5..926f30d88fc 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile.am
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am
@@ -1,35 +1,40 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's Dump Schedule Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.Dump_Schedule.am
-bin_PROGRAMS = Dump_Schedule
+noinst_PROGRAMS = Dump_Schedule
-Dump_Schedule_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+Dump_Schedule_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
Dump_Schedule_SOURCES = \
- Dump_Schedul.cpp
-
-## noinst_HEADERS =
-
-## EXTRA_DIST = README
+ Dump_Schedule.cpp
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+Dump_Schedule_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
index 5b39b7edfb1..f4a190213f9 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -1,36 +1,50 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's Event Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.Event_Service.am
-bin_PROGRAMS = Event_Service
+noinst_PROGRAMS = Event_Service
-Event_Service_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+Event_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs \
+ -DTAO_HAS_TYPED_EVENT_CHANNEL
Event_Service_SOURCES = \
- Event_Service.cpp
+ Event_Service.cpp
-noinst_HEADERS = \
- Event_Service.h
+Event_Service_LDADD = \
+ $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.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
-## EXTRA_DIST = README
+noinst_HEADERS = \
+ Event_Service.h
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
new file mode 100644
index 00000000000..24611ad85f2
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
@@ -0,0 +1,52 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.FTRT_Event_Service.am
+
+noinst_PROGRAMS = ftrt_eventservice
+
+ftrt_eventservice_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel \
+ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
+
+ftrt_eventservice_SOURCES = \
+ FT_EventService.cpp
+
+ftrt_eventservice_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_EventChannel.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.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_Utils.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
+
+noinst_HEADERS = \
+ FT_EventService.h \
+ TP_Task.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
new file mode 100644
index 00000000000..5bc5db16548
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
@@ -0,0 +1,51 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.FTRTEC_Factory_Service.am
+
+noinst_PROGRAMS = ftrtec_factory_service
+
+ftrtec_factory_service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+ftrtec_factory_service_SOURCES = \
+ EventChannelFactory_i.cpp \
+ FTRTEC_Factory_Service.cpp
+
+ftrtec_factory_service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+ EventChannelFactory_i.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
new file mode 100644
index 00000000000..79ee5cfa865
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
@@ -0,0 +1,46 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.FTRTEC_Gateway_Service.am
+
+noinst_PROGRAMS = ftrtec_gateway_service
+
+ftrtec_gateway_service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
+
+ftrtec_gateway_service_SOURCES = \
+ FTRTEC_Gateway_Service.cpp
+
+ftrtec_gateway_service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.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_IORManip.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
new file mode 100644
index 00000000000..ef6675a3e49
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
@@ -0,0 +1,7 @@
+## Process this file with automake to create Makefile.in
+
+SUBDIRS = \
+ Event_Service \
+ Factory_Service \
+ Gateway_Service
+
diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
new file mode 100644
index 00000000000..e7b4181ac89
--- /dev/null
+++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
@@ -0,0 +1,105 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.FT_ReplicationManager_Lib.am
+
+lib_LTLIBRARIES = libTAO_ReplicationManagerLib.la
+
+libTAO_ReplicationManagerLib_la_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs \
+ -DTAO_REPLICATIONMANAGERLIB_BUILD_DLL
+
+libTAO_ReplicationManagerLib_la_SOURCES = \
+ FT_FaultAnalyzer.cpp \
+ FT_DefaultFaultAnalyzer.cpp \
+ FT_FaultEventDescriptor.cpp \
+ FT_FaultConsumer.cpp
+
+libTAO_ReplicationManagerLib_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_ReplicationManagerLib_la_LIBADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.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_DynamicAny.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+ FT_FaultAnalyzer.h \
+ FT_FaultEventDescriptor.h \
+ FT_DefaultFaultAnalyzer.h \
+ FT_FaultConsumer.h
+
+
+## Makefile.FT_ReplicationManager.am
+
+noinst_PROGRAMS = FT_ReplicationManager
+
+FT_ReplicationManager_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+FT_ReplicationManager_SOURCES = \
+ FT_ReplicationManager.cpp \
+ FT_ReplicationManager_Main.cpp \
+ FT_Property_Validator.cpp \
+ FT_ReplicationManagerFaultAnalyzer.cpp
+
+FT_ReplicationManager_LDADD = \
+ libTAO_ReplicationManagerLib.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.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
+
+noinst_HEADERS += \
+ FT_ReplicationManagerFaultAnalyzer.h \
+ FT_Property_Validator.h \
+ FT_ReplicationManager.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am
new file mode 100644
index 00000000000..cb913c06ab4
--- /dev/null
+++ b/TAO/orbsvcs/Fault_Detector/Makefile.am
@@ -0,0 +1,53 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.Fault_Detector.am
+
+noinst_PROGRAMS = Fault_Detector
+
+Fault_Detector_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+Fault_Detector_SOURCES = \
+ Fault_Detector_i.cpp \
+ Fault_Detector_Main.cpp \
+ FT_FaultDetectorFactory_i.cpp
+
+Fault_Detector_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.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
+
+noinst_HEADERS = \
+ FT_FaultDetectorFactory_i.h \
+ Fault_Detector_i.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am
new file mode 100644
index 00000000000..c941b54cb4e
--- /dev/null
+++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am
@@ -0,0 +1,51 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.Fault_Notifier.am
+
+noinst_PROGRAMS = Fault_Notifier
+
+Fault_Notifier_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+Fault_Notifier_SOURCES = \
+ FT_Notifier_i.cpp \
+ Fault_Notifier_Main.cpp
+
+Fault_Notifier_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.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
+
+noinst_HEADERS = \
+ FT_Notifier_i.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am
index 1f4881303ee..ef0f466d495 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.am
+++ b/TAO/orbsvcs/IFR_Service/Makefile.am
@@ -1,128 +1,116 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's Interface Repository Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.IFR_Service.am
-bin_PROGRAMS = IFR_Service
+noinst_PROGRAMS = IFR_Service
-IFR_Service_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+IFR_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR)
IFR_Service_SOURCES = \
- AliasDef_i.cpp \
- ArrayDef_i.cpp \
- AttributeDef_i.cpp \
- ComponentDef_i.cpp \
- ComponentRepository_i.cpp \
- ConstantDef_i.cpp \
- ConsumesDef_i.cpp \
- Contained_i.cpp \
- Container_i.cpp \
- EmitsDef_i.cpp \
- EnumDef_i.cpp \
- EventDef_i.cpp \
- ExceptionDef_i.cpp \
- FactoryDef_i.cpp \
- FinderDef_i.cpp \
- FixedDef_i.cpp \
- HomeDef_i.cpp \
- IDLType_i.cpp \
- IFR_BaseS.cpp \
- IFR_BasicS.cpp \
- IFR_ComponentsS.cpp \
- IFR_ExtendedS.cpp \
- IFR_Server.cpp \
- IFR_Service.cpp \
- InterfaceDef_i.cpp \
- IRObject_i.cpp \
- ModuleDef_i.cpp \
- NativeDef_i.cpp \
- OperationDef_i.cpp \
- Options.cpp \
- PrimaryKeyDef_i.cpp \
- PrimitiveDef_i.cpp \
- ProvidesDef_i.cpp \
- PublishesDef_i.cpp \
- Repository_i.cpp \
- SequenceDef_i.cpp \
- Servant_Factory.cpp \
- Servant_Locator.cpp \
- StringDef_i.cpp \
- StructDef_i.cpp \
- tmplinst.cpp \
- TypedefDef_i.cpp \
- UnionDef_i.cpp \
- UsesDef_i.cpp \
- ValueBoxDef_i.cpp \
- ValueDef_i.cpp \
- ValueMemberDef_i.cpp \
- WstringDef_i.cpp
+ IFR_Server.cpp \
+ IFR_Service.cpp
+
+IFR_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \
+ $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.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_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
noinst_HEADERS = \
- AliasDef_i.h \
- ArrayDef_i.h \
- AttributeDef_i.h \
- ComponentDef_i.h \
- ComponentRepository_i.h \
- concrete_classes.h \
- ConstantDef_i.h \
- ConsumesDef_i.h \
- Contained_i.h \
- Container_i.h \
- EmitsDef_i.h \
- EnumDef_i.h \
- EventDef_i.h \
- ExceptionDef_i.h \
- FactoryDef_i.h \
- FinderDef_i.h \
- FixedDef_i.h \
- HomeDef_i.h \
- IDLType_i.h \
- IFR_BaseS.h \
- IFR_BasicS.h \
- IFR_ComponentsS.h \
- IFR_ExtendedS.h \
- IFR_Service.h \
- InterfaceDef_i.h \
- InterfaceS_T.h \
- IRObject_i.h \
- ModuleDef_i.h \
- NativeDef_i.cphp \
- OperationDef_i.h \
- Options.h \
- PrimaryKeyDef_i.h \
- PrimitiveDef_i.h \
- ProvidesDef_i.h \
- PublishesDef_i.h \
- Repository_i.h \
- SequenceDef_i.h \
- StringDef_i.h \
- StructDef_i.h \
- TypedefDef_i.h \
- UnionDef_i.h \
- UsesDef_i.h \
- ValueBoxDef_i.h \
- ValueDef_i.h \
- ValueMemberDef_i.h \
- WstringDef_i.h
-
-## EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+ IFR_Service.h
+
+## Makefile.TAO_IFR_BE.am
+
+lib_LTLIBRARIES = libTAO_IFR_BE.la
+
+libTAO_IFR_BE_la_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/TAO_IDL/include \
+ -I$(TAO_ROOT)/TAO_IDL/fe \
+ -DTAO_IFR_BE_BUILD_DLL
+
+libTAO_IFR_BE_la_SOURCES = \
+ be_global.cpp \
+ be_init.cpp \
+ be_produce.cpp \
+ ifr_adding_visitor.cpp \
+ ifr_adding_visitor_exception.cpp \
+ ifr_adding_visitor_operation.cpp \
+ ifr_adding_visitor_structure.cpp \
+ ifr_adding_visitor_union.cpp \
+ ifr_removing_visitor.cpp \
+ ifr_visitor.cpp
+
+libTAO_IFR_BE_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_IFR_BE_la_LIBADD = \
+ $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+ be_extern.h \
+ be_global.h \
+ ifr_adding_visitor_union.h \
+ ifr_adding_visitor_exception.h \
+ ifr_adding_visitor_structure.h \
+ ifr_adding_visitor_operation.h \
+ ifr_adding_visitor.h \
+ ifr_visitor.h \
+ ifr_removing_visitor.h
+
+
+## Makefile.TAO_IFR_EXE.am
+
+bin_PROGRAMS = tao_ifr
+
+tao_ifr_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/IFR_Service \
+ -I$(TAO_ROOT)/TAO_IDL/include \
+ -I$(TAO_ROOT)/TAO_IDL/fe
+
+tao_ifr_SOURCES = \
+ $(TAO_ROOT)/TAO_IDL/driver/drv_args.cpp \
+ $(TAO_ROOT)/TAO_IDL/driver/drv_preproc.cpp \
+ $(TAO_ROOT)/TAO_IDL/tao_idl.cpp
+
+tao_ifr_LDADD = \
+ libTAO_IFR_BE.la \
+ $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+ $(TAO_ROOT)/TAO_IDL/include/drv_extern.h
+
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
index d456fd634f0..b1ca8c9c112 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
@@ -1,42 +1,50 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's Life Cycle Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.LifeCycle_Service.am
-bin_PROGRAMS = LifeCycle_Service
+noinst_PROGRAMS = LifeCycle_Service
-LifeCycle_Service_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+LifeCycle_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
LifeCycle_Service_SOURCES = \
- Criteria_Evaluator.cpp \
- Factory_Trader.cpp \
- LifeCycle_Service.cpp \
- LifeCycle_Service_i.cpp
+ Factory_Trader.cpp \
+ Criteria_Evaluator.cpp \
+ LifeCycle_Service.cpp \
+ LifeCycle_Service_i.cpp
-noinst_HEADERS = \
- Criteria_Evaluator.h \
- Factory_Trader.h \
- LifeCycle_Service.h \
- LifeCycle_Service_i.h
+LifeCycle_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
-## EXTRA_DIST = README
+noinst_HEADERS = \
+ LifeCycle_Service_i.h \
+ Factory_Trader.h \
+ Criteria_Evaluator.h \
+ LifeCycle_Service.h
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am
new file mode 100644
index 00000000000..41c2fd88751
--- /dev/null
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.am
@@ -0,0 +1,82 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.CosLoadManager.am
+
+noinst_PROGRAMS = LoadManager
+
+LoadManager_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+LoadManager_SOURCES = \
+ LoadManager.cpp \
+ Signal_Handler.cpp
+
+LoadManager_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+ Signal_Handler.h
+
+## Makefile.CosLoadMonitor.am
+
+noinst_PROGRAMS += LoadMonitor
+
+LoadMonitor_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+LoadMonitor_SOURCES = \
+ LoadMonitor.cpp \
+ Push_Handler.cpp \
+ Monitor_Signal_Handler.cpp \
+ Signal_Handler.cpp
+
+LoadMonitor_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORManip.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+ Push_Handler.h \
+ Signal_Handler.h \
+ Monitor_Signal_Handler.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
new file mode 100644
index 00000000000..2bfd1e99121
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
@@ -0,0 +1,46 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.Basic_Logging_Service.am
+
+noinst_PROGRAMS = Basic_Logging_Service
+
+Basic_Logging_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs \
+ -I$(TAO_BUILDDIR)/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+Basic_Logging_Service_SOURCES = \
+ Basic_Logging_Service.cpp
+
+Basic_Logging_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+ Basic_Logging_Service.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
new file mode 100644
index 00000000000..be54683a0b2
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
@@ -0,0 +1,51 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.Event_Logging_Service.am
+
+noinst_PROGRAMS = Event_Logging_Service
+
+Event_Logging_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_BUILDDIR)/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs \
+ -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Event_Logging_Service_SOURCES = \
+ Event_Logging_Service.cpp
+
+Event_Logging_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+ Event_Logging_Service.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Makefile.am
new file mode 100644
index 00000000000..53741eaaba9
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Makefile.am
@@ -0,0 +1,8 @@
+## Process this file with automake to create Makefile.in
+
+SUBDIRS = \
+ Basic_Logging_Service \
+ Event_Logging_Service \
+ Notify_Logging_Service \
+ RTEvent_Logging_Service
+
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
new file mode 100644
index 00000000000..8d9d161d35a
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
@@ -0,0 +1,54 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.Notify_Logging_Service.am
+
+noinst_PROGRAMS = Notify_Logging_Service
+
+Notify_Logging_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_BUILDDIR)/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs \
+ -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Notify_Logging_Service_SOURCES = \
+ Notify_Logging_Server.cpp \
+ Notify_Logging_Service.cpp
+
+Notify_Logging_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+ Notify_Logging_Service.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
new file mode 100644
index 00000000000..8ee3233f598
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
@@ -0,0 +1,50 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.RTEvent_Logging_Service.am
+
+noinst_PROGRAMS = RTEvent_Logging_Service
+
+RTEvent_Logging_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_BUILDDIR)/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+RTEvent_Logging_Service_SOURCES = \
+ RTEvent_Logging_Service.cpp
+
+RTEvent_Logging_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+ RTEvent_Logging_Service.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
index 9cbb05a1349..3e864f17887 100644
--- a/TAO/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/Makefile.am
@@ -1,28 +1,32 @@
## Process this file with automake to create Makefile.in
SUBDIRS = \
- PSS \
- TAO_Service \
- orbsvcs
+ PSS \
+ TAO_Service \
+ orbsvcs \
+ Trading_Service \
+ Time_Service \
+ Scheduling_Service \
+ Notify_Service \
+ Naming_Service \
+ Logging_Service \
+ LoadBalancer \
+ LifeCycle_Service
-# Trading_Service \
-# Time_Service \
-# Scheduling_Service \
-# Notify_Service \
-# Naming_Service \
-# Logging_Service \
-# LoadBalancer \
-# LifeCycle_Service \
-# ImplRepo_Service \
-# IFR_Service \
-# Fault_Notifier \
-# Fault_Detector \
-# FT_ReplicationManager \
-# FTRT_Event_Service \
-# Event_Service \
-# Dump_Schedule \
-# CosEvent_Service \
-# Concurrency_Service \
-# performance-tests \
-# tests \
-# examples
+# ImplRepo_Service
+
+SUBDIRS += \
+ IFR_Service \
+ Fault_Notifier \
+ Fault_Detector \
+ FT_ReplicationManager \
+ FTRT_Event_Service \
+ Event_Service \
+ Dump_Schedule \
+ CosEvent_Service \
+ Concurrency_Service
+
+#
+# performance-tests \
+# tests \
+# examples
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
index eb0a2f09d7c..aeee835b58d 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -1,36 +1,74 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's Naming Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.NT_Naming_Service.am
-bin_PROGRAMS = Naming_Service
+noinst_PROGRAMS = NT_Naming_Service
-Naming_Service_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+NT_Naming_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
-Naming_Service_SOURCES = \
- Naming_Service.cpp
+NT_Naming_Service_SOURCES = \
+ Naming_Service.cpp \
+ NT_Naming_Server.cpp \
+ NT_Naming_Service.cpp
+
+NT_Naming_Service_LDADD = \
+ $(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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
noinst_HEADERS = \
- Naming_Service.h
+ NT_Naming_Service.h \
+ Naming_Service.h
-EXTRA_DIST = README
+## Makefile.Naming_Service.am
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+noinst_PROGRAMS += Naming_Service
+
+Naming_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+Naming_Service_SOURCES = \
+ Naming_Server.cpp \
+ Naming_Service.cpp
+
+Naming_Service_LDADD = \
+ $(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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+ Naming_Service.h
+
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am
new file mode 100644
index 00000000000..6a9f26b8679
--- /dev/null
+++ b/TAO/orbsvcs/Notify_Service/Makefile.am
@@ -0,0 +1,80 @@
+## Process this file with automake to create Makefile.in
+
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
+
+## Makefile.NT_Notify_Service.am
+
+noinst_PROGRAMS = NT_Notify_Service
+
+NT_Notify_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+NT_Notify_Service_SOURCES = \
+ Notify_Service.cpp \
+ NT_Notify_Server.cpp \
+ NT_Notify_Service.cpp
+
+NT_Notify_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.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_DynamicAny.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+ Notify_Service.h \
+ NT_Notify_Service.h
+
+## Makefile.Notify_Service.am
+
+noinst_PROGRAMS += Notify_Service
+
+Notify_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
+
+Notify_Service_SOURCES = \
+ Notify_Server.cpp \
+ Notify_Service.cpp
+
+Notify_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.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_DynamicAny.la \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+ Notify_Service.h
+
+## Clean up template repositories, etc.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am
index a1c9126feca..503520aaf4a 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile.am
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am
@@ -1,35 +1,42 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's Scheduling Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.Scheduling_Service.am
-bin_PROGRAMS = Scheduling_Service
+noinst_PROGRAMS = Scheduling_Service
-Scheduling_Service_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+Scheduling_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
Scheduling_Service_SOURCES = \
- Scheduling_Service.cpp
-
-## noinst_HEADERS =
-
-## EXTRA_DIST = README
+ Scheduling_Service.cpp
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+Scheduling_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS = \
+ Scheduling_Service.h
+
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am
index d675105e61e..987c518e5eb 100644
--- a/TAO/orbsvcs/Time_Service/Makefile.am
+++ b/TAO/orbsvcs/Time_Service/Makefile.am
@@ -1,47 +1,74 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's Time Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.Time_Service_Clerk.am
-bin_PROGRAMS = Time_Service_Server Time_Service_Clerk
+noinst_PROGRAMS = Time_Service_Clerk
-Time_Service_Server_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+Time_Service_Clerk_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
-Time_Service_Server_SOURCES = \
- IR_Helper.cpp \
- Server_i.cpp \
- Time_Service_Server.cpp
+Time_Service_Clerk_SOURCES = \
+ Clerk_i.cpp \
+ Time_Service_Clerk.cpp
Time_Service_Clerk_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Time_Service_Clerk_SOURCES = \
- Clerk_i.cpp \
- Time_Service_Clerk.cpp
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
noinst_HEADERS = \
- Clerk_i.h \
- IR_Helper.h \
- Server_i.h
+ Clerk_i.h
+
+## Makefile.Time_Service_Server.am
+
+noinst_PROGRAMS += Time_Service_Server
-EXTRA_DIST = README
+Time_Service_Server_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+Time_Service_Server_SOURCES = \
+ Server_i.cpp \
+ Time_Service_Server.cpp
+
+Time_Service_Server_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+ Server_i.h
+
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
index 859084b3f0b..866b0c34d69 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile.am
+++ b/TAO/orbsvcs/Trading_Service/Makefile.am
@@ -1,36 +1,47 @@
-##---------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for TAO's Trading Service
-##
-##---------------------------------------------------------------------------
-
-##
## Process this file with automake to create Makefile.in
-##
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_ROOT = $(top_srcdir)/..
+ACE_BUILDDIR = $(top_builddir)/..
+TAO_ROOT = $(top_srcdir)
+TAO_BUILDDIR = $(top_builddir)
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+## Makefile.Trading_Service.am
-bin_PROGRAMS = Trading_Service
+noinst_PROGRAMS = Trading_Service
-Trading_Service_LDADD = \
- $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+Trading_Service_CPPFLAGS = \
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
Trading_Service_SOURCES = \
- Trading_Service.cpp
+ Trading_Server.cpp \
+ Trading_Service.cpp
-noinst_HEADERS = \
- Trading_Service.h
+Trading_Service_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+Trading_Service_LDADD = \
+ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \
+ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.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_PortableServer.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+ $(TAO_BUILDDIR)/tao/libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
-EXTRA_DIST = README
+noinst_HEADERS = \
+ Trading_Service.h
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
+## Clean up template repositories, etc.
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
+ -rm -f gcctemp.c gcctemp so_locations
+ -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 844910ff10d..044ee9d16e2 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -87,7 +87,7 @@ libTAO_Svc_Utils_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS = \
+noinst_HEADERS = \
TimeBaseS_T.h \
Channel_Clients_T.h \
TimeBaseC.h \
@@ -180,7 +180,7 @@ libTAO_CosNaming_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Naming/naming_export.h \
Channel_Clients_T.h \
CosNamingS_T.h \
@@ -263,7 +263,7 @@ libTAO_CosProperty_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
CosPropertyServiceS_T.h \
Channel_Clients_T.h \
Property/CosPropertyService_i.h \
@@ -405,7 +405,7 @@ libTAO_AV_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
AV/TCP.h \
AV/Transport.h \
sfpC.h \
@@ -523,7 +523,7 @@ libTAO_CosConcurrency_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Channel_Clients_T.h \
CosConcurrencyControlS_T.h \
Concurrency/CC_LockSetFactory.h \
@@ -591,56 +591,6 @@ CLEANFILES += \
CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS_T.h CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.inl: CosTypedEventChannelAdmin.idl
$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $<
-BUILT_SOURCES += \
- CosEventCommS_T.cpp \
- CosEventCommC.cpp \
- CosEventCommS.cpp \
- CosEventCommC.h \
- CosEventCommS.h \
- CosEventCommS_T.h \
- CosEventCommC.inl \
- CosEventCommS.inl \
- CosEventCommS_T.inl
-
-CLEANFILES += \
- CosEventCommS_T.cpp \
- CosEventCommC.cpp \
- CosEventCommS.cpp \
- CosEventCommC.h \
- CosEventCommS.h \
- CosEventCommS_T.h \
- CosEventCommC.inl \
- CosEventCommS.inl \
- CosEventCommS_T.inl
-
-CosEventCommS_T.cpp CosEventCommC.cpp CosEventCommS.cpp CosEventCommC.h CosEventCommS.h CosEventCommS_T.h CosEventCommC.inl CosEventCommS.inl CosEventCommS_T.inl: CosEventComm.idl
- $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $<
-
-BUILT_SOURCES += \
- CosEventChannelAdminS_T.cpp \
- CosEventChannelAdminC.cpp \
- CosEventChannelAdminS.cpp \
- CosEventChannelAdminC.h \
- CosEventChannelAdminS.h \
- CosEventChannelAdminS_T.h \
- CosEventChannelAdminC.inl \
- CosEventChannelAdminS.inl \
- CosEventChannelAdminS_T.inl
-
-CLEANFILES += \
- CosEventChannelAdminS_T.cpp \
- CosEventChannelAdminC.cpp \
- CosEventChannelAdminS.cpp \
- CosEventChannelAdminC.h \
- CosEventChannelAdminS.h \
- CosEventChannelAdminS_T.h \
- CosEventChannelAdminC.inl \
- CosEventChannelAdminS.inl \
- CosEventChannelAdminS_T.inl
-
-CosEventChannelAdminS_T.cpp CosEventChannelAdminC.cpp CosEventChannelAdminS.cpp CosEventChannelAdminC.h CosEventChannelAdminS.h CosEventChannelAdminS_T.h CosEventChannelAdminC.inl CosEventChannelAdminS.inl CosEventChannelAdminS_T.inl: CosEventChannelAdmin.idl
- $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $<
-
CosEvent = \
CosTypedEventCommC.cpp \
CosTypedEventChannelAdminC.cpp \
@@ -706,7 +656,7 @@ libTAO_CosEvent_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
CosEvent/CEC_Factory.h \
CosEvent/CEC_Pulling_Strategy.h \
CosEvent/CEC_DynamicImplementation.h \
@@ -874,7 +824,7 @@ libTAO_CosLifeCycle_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
LifeCycleServiceS_T.h \
Channel_Clients_T.h \
CosLifeCycleS_T.h \
@@ -966,7 +916,7 @@ libTAO_FTORB_Utils_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Channel_Clients_T.h \
PortableGroup_Simple_DSS_T.h \
FT_CORBA_ORBS_T.h \
@@ -1109,7 +1059,7 @@ libTAO_PortableGroup_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
PortableGroup/PG_Factory_Map.h \
PortableGroup/PG_Location_Map.h \
PortableGroup/PG_Group_Factory.h \
@@ -1282,7 +1232,7 @@ libTAO_CosLoadBalancing_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
LoadBalancing/LB_ObjectReferenceFactory.h \
LoadBalancing/LB_LoadAlertInfo.h \
LoadBalancing/LB_LoadMap.h \
@@ -1354,7 +1304,7 @@ libTAO_ETCL_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
ETCL/ETCL_Constraint.h \
Channel_Clients_T.h \
ETCL/ETCL_Interpreter.h \
@@ -1679,7 +1629,7 @@ libTAO_CosNotification_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Notify/Notify_Default_POA_Factory.h \
Notify/Default_Factory.h \
Notify/CosNotify_Service.h \
@@ -1933,7 +1883,7 @@ libTAO_CosTime_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Channel_Clients_T.h \
TimeServiceS_T.h \
Time/TAO_Time_Service_Server.h \
@@ -2074,7 +2024,7 @@ libTAO_CosTrading_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Trader/Trader_Constraint_Visitors.h \
Trader/Service_Type_Repository.h \
Trader/Offer_Database.h \
@@ -2205,7 +2155,7 @@ libTAO_DsLogAdmin_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Log/Log_Constraint_Visitors.h \
Log/BasicLogFactory_i.h \
Log/Iterator_i.h \
@@ -2300,7 +2250,7 @@ libTAO_DsEventLogAdmin_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Log/EventLogConsumer.h \
DsEventLogAdminC.h \
DsEventLogAdminS.h \
@@ -2386,7 +2336,7 @@ libTAO_DsNotifyLogAdmin_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Log/NotifyLog_i.h \
DsNotifyLogAdminC.h \
Log/NotifyLogFactory_i.h \
@@ -2433,7 +2383,7 @@ libTAO_FTRT_ClientORB_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h \
FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h \
FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \
@@ -2648,7 +2598,7 @@ libTAO_RTEvent_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Event/ECG_Adapters.h \
Event/EC_Filter_Builder.h \
Event/EC_Masked_Type_Filter.h \
@@ -2959,7 +2909,7 @@ libTAO_FtRtEvent_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
FtRtEvent/Utils/Safe_InputCDR.h \
FTRTC.h \
FtRtecEventCommC.h \
@@ -3072,7 +3022,7 @@ libTAO_FTRT_EventChannel_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
FtRtEvent/EventChannel/Fault_Detector_Loader.h \
FtRtEvent/EventChannel/create_persistent_poa.h \
FtRtEvent/EventChannel/Request_Context_Repository.h \
@@ -3159,7 +3109,7 @@ libTAO_FT_ClientORB_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
FaultTolerance/FT_ClientRequest_Interceptor.h \
FaultTolerance/FT_ClientPolicy_i.h \
FaultTolerance/FT_Invocation_Endpoint_Selectors.h \
@@ -3216,7 +3166,7 @@ libTAO_FT_ServerORB_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Channel_Clients_T.h \
FaultTolerance/FT_ServerPolicyFactory.h \
FaultTolerance/FT_ServerRequest_Interceptor.h \
@@ -3402,7 +3352,7 @@ libTAO_FaultTolerance_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
FT_FaultDetectorFactoryS_T.h \
Channel_Clients_T.h \
FT_ReplicationManagerS_T.h \
@@ -3510,7 +3460,7 @@ libTAO_IFRService_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
IFRService/ComponentRepository_i.h \
IFRService/ExtAbstractInterfaceDef_i.h \
IFRService/ComponentContainer_i.h \
@@ -3611,7 +3561,7 @@ libTAO_RTCORBAEvent_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Channel_Clients_T.h \
Event/EC_RTCORBA_Dispatching.h \
Event/EC_RTCORBA_Factory.h \
@@ -3680,7 +3630,7 @@ libTAO_RTCosScheduling_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
RTCosScheduling/RTCosScheduling_ServerScheduler_i.h \
RTCosScheduling/RTCosScheduling_ClientScheduler_i.h \
RTCosSchedulingC.h \
@@ -3765,7 +3715,7 @@ libTAO_RTSched_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Runtime_Scheduler.h \
Sched/Config_Scheduler.h \
Sched/Reconfig_Scheduler.h \
@@ -3844,7 +3794,7 @@ libTAO_RTOLDEvent_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Event/ReactorTask.h \
Event/RT_Task.h \
Event/BCU.h \
@@ -3937,7 +3887,7 @@ libTAO_RTEventLogAdmin_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Channel_Clients_T.h \
RTEventLogAdminS_T.h \
Log/RTEventLogNotification.h \
@@ -3991,7 +3941,7 @@ libTAO_RTKokyuEvent_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Event/EC_Kokyu_Scheduling.h \
Event/EC_Kokyu_Dispatching.h \
Event/EC_Kokyu_Filter.h \
@@ -4046,7 +3996,7 @@ libTAO_RTSchedEvent_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Event/EC_Sched_Filter.h \
Event/EC_Priority_Scheduling.h \
Event/EC_Gateway_Sched.h \
@@ -4101,7 +4051,7 @@ libTAO_RT_Notification_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Channel_Clients_T.h \
Notify/RT_Builder.h \
Notify/RT_POA_Helper.h \
@@ -4338,7 +4288,7 @@ libTAO_Security_la_LIBADD = \
$(top_builddir)/tao/libTAO.la \
$(top_builddir)/../ace/libACE.la
-nobase_pkginclude_HEADERS += \
+noinst_HEADERS += \
Security/SL3_ObjectCredentialsPolicy.h \
Security/SL3_SecurityCurrent.h \
Security/SL3_SecurityManager.h \