diff options
Diffstat (limited to 'TAO/orbsvcs')
23 files changed, 422 insertions, 219 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am index 2c58dcc0132..1d6033fd8ac 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile.am +++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am @@ -1,13 +1,20 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.Concurrency_Service.am +bin_PROGRAMS = -bin_PROGRAMS = Concurrency_Service +## Makefile.Concurrency_Service.am + +if BUILD_CORBA_MESSAGING + +bin_PROGRAMS += Concurrency_Service Concurrency_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -22,6 +29,7 @@ Concurrency_Service_SOURCES = \ Concurrency_Service.h Concurrency_Service_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -34,8 +42,12 @@ Concurrency_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am index a8ad39313de..dc9f00e2704 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile.am +++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am @@ -1,15 +1,21 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.CosEvent_Service.am +bin_PROGRAMS = +## Makefile.CosEvent_Service.am + +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = CosEvent_Service +bin_PROGRAMS += CosEvent_Service CosEvent_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -25,23 +31,26 @@ CosEvent_Service_SOURCES = \ CosEvent_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.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_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am index 7fb792c49ef..71cfd618850 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile.am +++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am @@ -1,11 +1,14 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.Dump_Schedule.am +## Makefile.Dump_Schedule.am bin_PROGRAMS = Dump_Schedule @@ -31,6 +34,8 @@ Dump_Schedule_LDADD = \ ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am index d0b1273b3af..6611dfa9b25 100644 --- a/TAO/orbsvcs/Event_Service/Makefile.am +++ b/TAO/orbsvcs/Event_Service/Makefile.am @@ -1,15 +1,20 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.Event_Service.am +## Makefile.Event_Service.am -if !BUILD_MINIMUM_CORBA +if BUILD_CORBA_MESSAGING -bin_PROGRAMS = Event_Service +bin_PROGRAMS += Event_Service Event_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -17,8 +22,7 @@ Event_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_BUILDDIR)/orbsvcs Event_Service_SOURCES = \ Event_Service.cpp \ @@ -38,10 +42,12 @@ Event_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -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 index c3fcee5e40f..5d21d0dc835 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am @@ -1,16 +1,21 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = -## Makefile.FTRT_Event_Service.am +## Makefile.FTRT_Event_Service.am if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = ftrt_eventservice +noinst_PROGRAMS += ftrt_eventservice ftrt_eventservice_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -49,6 +54,8 @@ endif BUILD_CORBA_MESSAGING ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -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 index 40653ddb2b5..88764616d04 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am @@ -1,16 +1,23 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = -## Makefile.FTRTEC_Factory_Service.am +## Makefile.FTRTEC_Factory_Service.am if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = ftrtec_factory_service +noinst_PROGRAMS += ftrtec_factory_service ftrtec_factory_service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -28,8 +35,6 @@ ftrtec_factory_service_SOURCES = \ ftrtec_factory_service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ @@ -46,10 +51,14 @@ ftrtec_factory_service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -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 index d46fcdc9e68..da19a54987c 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am @@ -1,16 +1,28 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = -## Makefile.FTRTEC_Gateway_Service.am +## Makefile.FTRTEC_Gateway_Service.am if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = ftrtec_gateway_service +noinst_PROGRAMS += ftrtec_gateway_service ftrtec_gateway_service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -40,10 +52,14 @@ ftrtec_gateway_service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am index 7d156abde51..a17071b66c7 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am +++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am @@ -1,16 +1,25 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.FT_ReplicationManager_Lib.am +bin_PROGRAMS = +lib_LTLIBRARIES = +noinst_HEADERS = + +## Makefile.FT_ReplicationManager_Lib.am if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -lib_LTLIBRARIES = libTAO_ReplicationManagerLib.la +lib_LTLIBRARIES += libTAO_ReplicationManagerLib.la libTAO_ReplicationManagerLib_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -32,6 +41,8 @@ libTAO_ReplicationManagerLib_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_ReplicationManagerLib_la_LIBADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ @@ -47,21 +58,25 @@ libTAO_ReplicationManagerLib_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ +noinst_HEADERS += \ FT_DefaultFaultAnalyzer.h \ FT_FaultAnalyzer.h \ FT_FaultConsumer.h \ FT_FaultEventDescriptor.h endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID -## Makefile.FT_ReplicationManager.am +## Makefile.FT_ReplicationManager.am if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = FT_ReplicationManager +bin_PROGRAMS += FT_ReplicationManager FT_ReplicationManager_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -86,8 +101,6 @@ FT_ReplicationManager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ @@ -104,10 +117,14 @@ FT_ReplicationManager_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am index f05999275fb..41d941277c8 100644 --- a/TAO/orbsvcs/Fault_Detector/Makefile.am +++ b/TAO/orbsvcs/Fault_Detector/Makefile.am @@ -1,16 +1,23 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.Fault_Detector.am +## Makefile.Fault_Detector.am if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = Fault_Detector +bin_PROGRAMS += Fault_Detector Fault_Detector_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -45,10 +52,14 @@ Fault_Detector_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index 8c0c899723f..30e3a451728 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -1,16 +1,23 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.Fault_Notifier.am +## Makefile.Fault_Notifier.am if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = Fault_Notifier +bin_PROGRAMS += Fault_Notifier Fault_Notifier_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -32,8 +39,7 @@ Fault_Notifier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ @@ -50,10 +56,14 @@ Fault_Notifier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am index 4e6b40c3a68..b3acf102e10 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.am +++ b/TAO/orbsvcs/IFR_Service/Makefile.am @@ -1,15 +1,25 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf + +lib_LTLIBRARIES = +bin_PROGRAMS = +noinst_HEADERS = -## Makefile.IFR_Service.am +## Makefile.IFR_Service.am if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = IFR_Service +bin_PROGRAMS += IFR_Service IFR_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -36,11 +46,11 @@ IFR_Service_LDADD = \ endif !BUILD_MINIMUM_CORBA -## Makefile.TAO_IFR_BE.am +## Makefile.TAO_IFR_BE.am if !BUILD_MINIMUM_CORBA -lib_LTLIBRARIES = libTAO_IFR_BE.la +lib_LTLIBRARIES += libTAO_IFR_BE.la libTAO_IFR_BE_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -72,7 +82,7 @@ libTAO_IFR_BE_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ +noinst_HEADERS += \ be_extern.h \ be_global.h \ ifr_adding_visitor.h \ @@ -85,7 +95,7 @@ noinst_HEADERS = \ endif !BUILD_MINIMUM_CORBA -## Makefile.TAO_IFR_EXE.am +## Makefile.TAO_IFR_EXE.am if !BUILD_MINIMUM_CORBA @@ -101,9 +111,9 @@ tao_ifr_CPPFLAGS = \ -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 \ + drv_args.cpp \ + drv_preproc.cpp \ + tao_idl.cpp \ $(TAO_ROOT)/TAO_IDL/include/drv_extern.h tao_ifr_LDADD = \ @@ -117,6 +127,8 @@ endif !BUILD_MINIMUM_CORBA ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index 99a66870116..5f83ad381af 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -2,11 +2,6 @@ ## ## $Id$ ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -22,34 +17,34 @@ noinst_HEADERS = CLEANFILES = BUILT_SOURCES = -## Makefile.ImR_Activator_IDL.am +## Makefile.ImR_Activator_IDL.am if BUILD_CORBA_MESSAGING BUILT_SOURCES += \ - ImR_ActivatorS_T.cpp \ ImR_ActivatorC.inl \ ImR_ActivatorS.inl \ ImR_ActivatorS_T.inl \ - ImR_ActivatorC.cpp \ - ImR_ActivatorS.cpp \ ImR_ActivatorC.h \ ImR_ActivatorS.h \ - ImR_ActivatorS_T.h + ImR_ActivatorS_T.h \ + ImR_ActivatorC.cpp \ + ImR_ActivatorS.cpp \ + ImR_ActivatorS_T.cpp CLEANFILES += \ - ImR_ActivatorS_T.cpp \ + ImR_Activator-stamp \ ImR_ActivatorC.inl \ ImR_ActivatorS.inl \ ImR_ActivatorS_T.inl \ - ImR_ActivatorC.cpp \ - ImR_ActivatorS.cpp \ ImR_ActivatorC.h \ ImR_ActivatorS.h \ ImR_ActivatorS_T.h \ - ImR_Activator-stamp + ImR_ActivatorC.cpp \ + ImR_ActivatorS.cpp \ + ImR_ActivatorS_T.cpp -ImR_ActivatorS_T.cpp ImR_ActivatorC.inl ImR_ActivatorS.inl ImR_ActivatorS_T.inl ImR_ActivatorC.cpp ImR_ActivatorS.cpp ImR_ActivatorC.h ImR_ActivatorS.h ImR_ActivatorS_T.h: ImR_Activator-stamp +ImR_ActivatorC.inl ImR_ActivatorS.inl ImR_ActivatorS_T.inl ImR_ActivatorC.h ImR_ActivatorS.h ImR_ActivatorS_T.h ImR_ActivatorC.cpp ImR_ActivatorS.cpp ImR_ActivatorS_T.cpp: ImR_Activator-stamp ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GH -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl @@ -74,6 +69,7 @@ libTAO_ImR_Activator_IDL_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_ImR_Activator_IDL_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -81,46 +77,46 @@ libTAO_ImR_Activator_IDL_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la noinst_HEADERS += \ + ImR_Activator.idl \ ImR_ActivatorC.h \ - ImR_ActivatorS.h \ - ImR_ActivatorS_T.h \ - activator_idl_export.h \ ImR_ActivatorC.inl \ + ImR_ActivatorS.h \ ImR_ActivatorS.inl \ - ImR_ActivatorS_T.inl \ ImR_ActivatorS_T.cpp \ - ImR_Activator.idl + ImR_ActivatorS_T.h \ + ImR_ActivatorS_T.inl \ + activator_idl_export.h endif BUILD_CORBA_MESSAGING -## Makefile.ImR_Locator_IDL.am +## Makefile.ImR_Locator_IDL.am if BUILD_CORBA_MESSAGING BUILT_SOURCES += \ - ImR_LocatorS_T.cpp \ ImR_LocatorC.inl \ ImR_LocatorS.inl \ ImR_LocatorS_T.inl \ - ImR_LocatorC.cpp \ - ImR_LocatorS.cpp \ ImR_LocatorC.h \ ImR_LocatorS.h \ - ImR_LocatorS_T.h + ImR_LocatorS_T.h \ + ImR_LocatorC.cpp \ + ImR_LocatorS.cpp \ + ImR_LocatorS_T.cpp CLEANFILES += \ - ImR_LocatorS_T.cpp \ + ImR_Locator-stamp \ ImR_LocatorC.inl \ ImR_LocatorS.inl \ ImR_LocatorS_T.inl \ - ImR_LocatorC.cpp \ - ImR_LocatorS.cpp \ ImR_LocatorC.h \ ImR_LocatorS.h \ ImR_LocatorS_T.h \ - ImR_Locator-stamp + ImR_LocatorC.cpp \ + ImR_LocatorS.cpp \ + ImR_LocatorS_T.cpp -ImR_LocatorS_T.cpp ImR_LocatorC.inl ImR_LocatorS.inl ImR_LocatorS_T.inl ImR_LocatorC.cpp ImR_LocatorS.cpp ImR_LocatorC.h ImR_LocatorS.h ImR_LocatorS_T.h: ImR_Locator-stamp +ImR_LocatorC.inl ImR_LocatorS.inl ImR_LocatorS_T.inl ImR_LocatorC.h ImR_LocatorS.h ImR_LocatorS_T.h ImR_LocatorC.cpp ImR_LocatorS.cpp ImR_LocatorS_T.cpp: ImR_Locator-stamp ImR_Locator-stamp: $(srcdir)/ImR_Locator.idl $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl @@ -146,25 +142,26 @@ libTAO_ImR_Locator_IDL_la_LDFLAGS = \ libTAO_ImR_Locator_IDL_la_LIBADD = \ libTAO_ImR_Activator_IDL.la \ + $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la noinst_HEADERS += \ + ImR_Locator.idl \ ImR_LocatorC.h \ - ImR_LocatorS.h \ - ImR_LocatorS_T.h \ - locator_idl_export.h \ ImR_LocatorC.inl \ + ImR_LocatorS.h \ ImR_LocatorS.inl \ - ImR_LocatorS_T.inl \ ImR_LocatorS_T.cpp \ - ImR_Locator.idl + ImR_LocatorS_T.h \ + ImR_LocatorS_T.inl \ + locator_idl_export.h endif BUILD_CORBA_MESSAGING -## Makefile.ImR_Activator.am +## Makefile.ImR_Activator.am if BUILD_ACEXML if BUILD_CORBA_MESSAGING @@ -193,6 +190,7 @@ libTAO_ImR_Activator_la_LDFLAGS = \ libTAO_ImR_Activator_la_LIBADD = \ libTAO_ImR_Activator_IDL.la \ libTAO_ImR_Locator_IDL.la \ + $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ @@ -210,7 +208,7 @@ endif !BUILD_MINIMUM_CORBA endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML -## Makefile.ImR_Activator_Service.am +## Makefile.ImR_Activator_Service.am if BUILD_ACEXML if BUILD_CORBA_MESSAGING @@ -232,13 +230,11 @@ ImR_Activator_SOURCES = \ ImR_Activator.cpp \ Activator_NT_Service.h -ImR_Activator_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - ImR_Activator_LDADD = \ libTAO_ImR_Activator.la \ libTAO_ImR_Activator_IDL.la \ libTAO_ImR_Locator_IDL.la \ + $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -252,10 +248,10 @@ endif !BUILD_MINIMUM_CORBA endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML -## Makefile.ImR_Locator.am +## Makefile.ImR_Locator.am -if BUILD_CORBA_MESSAGING if BUILD_ACEXML +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_ImR_Locator.la @@ -289,6 +285,7 @@ libTAO_ImR_Locator_la_LDFLAGS = \ libTAO_ImR_Locator_la_LIBADD = \ libTAO_ImR_Locator_IDL.la \ libTAO_ImR_Activator_IDL.la \ + $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -315,13 +312,13 @@ noinst_HEADERS += \ utils.h endif !BUILD_MINIMUM_CORBA -endif BUILD_ACEXML endif BUILD_CORBA_MESSAGING +endif BUILD_ACEXML -## Makefile.ImR_Locator_Service.am +## Makefile.ImR_Locator_Service.am -if BUILD_CORBA_MESSAGING if BUILD_ACEXML +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA bin_PROGRAMS += ImplRepo_Service @@ -340,13 +337,11 @@ ImplRepo_Service_SOURCES = \ Locator_NT_Service.cpp \ Locator_NT_Service.h -ImplRepo_Service_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - ImplRepo_Service_LDADD = \ libTAO_ImR_Locator.la \ libTAO_ImR_Activator_IDL.la \ libTAO_ImR_Locator_IDL.la \ + $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ @@ -358,10 +353,10 @@ ImplRepo_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA -endif BUILD_ACEXML endif BUILD_CORBA_MESSAGING +endif BUILD_ACEXML -## Makefile.tao_imr.am +## Makefile.tao_imr.am if !BUILD_MINIMUM_CORBA @@ -378,10 +373,8 @@ tao_imr_SOURCES = \ tao_imr_i.cpp \ tao_imr_i.h -tao_imr_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - tao_imr_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am index 1583bc278c8..3f018f28f1b 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am @@ -1,15 +1,20 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.LifeCycle_Service.am +## Makefile.LifeCycle_Service.am if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = LifeCycle_Service +bin_PROGRAMS += LifeCycle_Service LifeCycle_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -30,6 +35,7 @@ LifeCycle_Service_SOURCES = \ LifeCycle_Service_i.h LifeCycle_Service_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -45,6 +51,8 @@ endif !BUILD_MINIMUM_CORBA ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am index ab6a73c5bef..981812584c3 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.am +++ b/TAO/orbsvcs/LoadBalancer/Makefile.am @@ -1,17 +1,23 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.LoadManager.am +## Makefile.LoadManager.am if BUILD_AMI +if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = LoadManager +bin_PROGRAMS += LoadManager LoadManager_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -42,11 +48,13 @@ LoadManager_LDADD = \ endif !BUILD_MINIMUM_CORBA endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.LoadMonitor.am +## Makefile.LoadMonitor.am if BUILD_AMI +if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA @@ -84,10 +92,13 @@ LoadMonitor_LDADD = \ endif !BUILD_MINIMUM_CORBA endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING endif BUILD_AMI ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -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 index 66f65eb0284..93054020a03 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am @@ -1,11 +1,14 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.Basic_Logging_Service.am +## Makefile.Basic_Logging_Service.am bin_PROGRAMS = Basic_Logging_Service @@ -23,6 +26,7 @@ Basic_Logging_Service_SOURCES = \ Basic_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ @@ -34,6 +38,8 @@ Basic_Logging_Service_LDADD = \ ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -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 index a827aca7cb3..7895102cd35 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -1,15 +1,21 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.Event_Logging_Service.am +## Makefile.Event_Logging_Service.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = Event_Logging_Service +bin_PROGRAMS += Event_Logging_Service Event_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -32,6 +38,7 @@ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \ @@ -46,9 +53,12 @@ Event_Logging_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am index fe5796ea223..fc814f53769 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -1,15 +1,20 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.Notify_Logging_Service.am +## Makefile.Notify_Logging_Service.am if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = Notify_Logging_Service +bin_PROGRAMS += Notify_Logging_Service Notify_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index 9274beeb8c5..611a028fee2 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -1,13 +1,20 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.RTEvent_Logging_Service.am +## Makefile.RTEvent_Logging_Service.am -bin_PROGRAMS = RTEvent_Logging_Service +if BUILD_CORBA_MESSAGING + +bin_PROGRAMS += RTEvent_Logging_Service RTEvent_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -26,10 +33,10 @@ RTEvent_Logging_Service_LDADD = \ $(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_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ @@ -39,8 +46,12 @@ RTEvent_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index e2c02543132..c52684edcaf 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -1,13 +1,20 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.NT_Naming_Service.am +## Makefile.NT_Naming_Service.am -bin_PROGRAMS = NT_Naming_Service +if BUILD_CORBA_MESSAGING + +bin_PROGRAMS += NT_Naming_Service NT_Naming_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -36,7 +43,11 @@ NT_Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Naming_Service.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Naming_Service.am + +if BUILD_CORBA_MESSAGING bin_PROGRAMS += Naming_Service @@ -65,8 +76,12 @@ Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index 0ceeaa1e7f7..ba0f3051412 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -1,15 +1,20 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.NT_Notify_Service.am +## Makefile.NT_Notify_Service.am if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = NT_Notify_Service +bin_PROGRAMS += NT_Notify_Service NT_Notify_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -35,19 +40,16 @@ NT_Notify_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA -## Makefile.Notify_Service.am +## Makefile.Notify_Service.am if !BUILD_MINIMUM_CORBA @@ -75,13 +77,10 @@ Notify_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -89,6 +88,8 @@ endif !BUILD_MINIMUM_CORBA ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am index 6eb147f68f8..3c57060b0f8 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile.am +++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am @@ -1,11 +1,14 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.Scheduling_Service.am +## Makefile.Scheduling_Service.am bin_PROGRAMS = Scheduling_Service @@ -22,6 +25,7 @@ Scheduling_Service_SOURCES = \ Scheduling_Service.h Scheduling_Service_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ @@ -32,6 +36,8 @@ Scheduling_Service_LDADD = \ ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am index c202120c147..962340d1d01 100644 --- a/TAO/orbsvcs/Time_Service/Makefile.am +++ b/TAO/orbsvcs/Time_Service/Makefile.am @@ -1,13 +1,20 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.Time_Service_Clerk.am +## Makefile.Time_Service_Clerk.am -bin_PROGRAMS = Time_Service_Clerk +if BUILD_CORBA_MESSAGING + +bin_PROGRAMS += Time_Service_Clerk Time_Service_Clerk_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -23,6 +30,7 @@ Time_Service_Clerk_SOURCES = \ Clerk_i.h Time_Service_Clerk_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -35,7 +43,11 @@ Time_Service_Clerk_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Time_Service_Server.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Time_Service_Server.am + +if BUILD_CORBA_MESSAGING bin_PROGRAMS += Time_Service_Server @@ -53,6 +65,7 @@ Time_Service_Server_SOURCES = \ Server_i.h Time_Service_Server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -65,8 +78,12 @@ Time_Service_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am index 12056013012..ede861e5554 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile.am +++ b/TAO/orbsvcs/Trading_Service/Makefile.am @@ -1,11 +1,14 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.Trading_Service.am +## Makefile.Trading_Service.am bin_PROGRAMS = Trading_Service @@ -27,14 +30,17 @@ Trading_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB |