added dependency of Event on Sched, and Event2 on Event's IDL_SRC's.

Reordered subset support to be top-to-bottom, so that lower level
services can be easily included if needed only by higher level
services.

1 files changed, 145 insertions, 136 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index 11d820187c9..d42af76b36d 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -24,7 +24,7 @@ endif
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
 override TAO_IDLFLAGS += \
-	-I$(TAO_ROOT) \
+        -I$(TAO_ROOT) \
         -Wb,export_macro=TAO_ORBSVCS_Export \
         -Wb,export_include=orbsvcs_export.h \
         $(TAO_LACKS_EVENT_CHANNEL_ANY)
@@ -46,85 +46,117 @@ ifndef TAO_ORBSVCS
   #### Please see docs/configurations.html#orbsvcs for documentation of
   #### TAO_ORBSVCS.
   TAO_ORBSVCS = Naming \
+                ImplRepo \
                 Time \
                 Log \
                 Concurrency \
                 LifeCycle \
-                ImplRepo \
                 Property \
                 Trader \
                 Sched \
                 Event \
                 CosEvent \
-                AV \
-		Event2
+                Event2 \
+                AV
 endif # TAO_ORBSVCS
 
 ####
 #### TAO_ORBSVCS support.
 ####
-ifneq (,$(findstring Naming,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosNaming
+ifneq (,$(findstring AV,$(TAO_ORBSVCS)))
+  IDL_SRCS += AVStreams Null_MediaCtrl sfp
   TAO_ORBSVCS_SRCS += \
-        IOR_Multicast \
-        Naming/Naming_Context \
-	Naming/Hash_Naming_Context \
-        Naming/Entries \
-	Naming/Persistent_Naming_Context \
-	Naming/Persistent_Entries \
-	Naming/Persistent_Bindings_Map \
-	Naming/Persistent_Context_Index \
-        Naming/Naming_Utils
-endif # Naming
+        AV/AVStreams_i \
+        AV/Endpoint_Strategy \
+        AV/Endpoint_Strategy_T\
+        AV/AVStreams_i_T
+endif # AV
 
-ifneq (,$(findstring Time,$(TAO_ORBSVCS)))
-  IDL_SRCS += TimeBase TimeService
+ifneq (,$(findstring Event2,$(TAO_ORBSVCS)))
+  ifeq (,$(findstring Event,$(TAO_ORBSVCS)))
+    IDL_SRCS += RtecEventComm RtecEventChannelAdmin RtecUDPAdmin
+  endif # Event
   TAO_ORBSVCS_SRCS += \
-        Time_Utilities \
-        Time/TAO_Time_Service_Server \
-        Time/TAO_Time_Service_Clerk \
-        Time/TAO_UTO \
-        Time/TAO_TIO \
-        Time/Timer_Helper
+        Event/EC_Event_Channel \
+        Event/EC_ConsumerAdmin \
+        Event/EC_SupplierAdmin \
+        Event/EC_ProxyConsumer \
+        Event/EC_ProxySupplier \
+        Event/EC_SupplierFiltering \
+        Event/EC_Supplier_Filter_Builder \
+        Event/EC_Trivial_Supplier_Filter \
+        Event/EC_Filter \
+        Event/EC_Filter_Builder \
+        Event/EC_Dispatching \
+        Event/EC_Factory \
+        Event/EC_QOS_Info \
+        Event/EC_Null_Factory \
+        Event/EC_Disjunction_Filter \
+        Event/EC_Conjunction_Filter \
+        Event/EC_Type_Filter \
+        Event/EC_Basic_Filter_Builder \
+        Event/EC_Basic_Factory \
+        Event/EC_Default_Factory \
+        Event/EC_ObserverStrategy \
+        Event/EC_ProxyPushSupplier_Set \
+        Event/EC_Per_Supplier_Filter \
+        Event/EC_Timeout_Filter \
+        Event/EC_Timeout_Generator \
+        Event/EC_Reactive_Timeout_Generator
 
-  #### TAO's Time Service requires its ImplRepo Service.
-  ifeq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-    #### Add ImplRepo
-    TAO_ORBSVCS += ImplRepo
-  endif # ! ImplRepo
-endif # Time
+  #### TAO's Event requires its Sched Service.
+  ifeq (,$(findstring Sched,$(TAO_ORBSVCS)))
+    TAO_ORBSVCS += Sched
+  endif # ! Sched
+endif # Event2
 
-ifneq (,$(findstring Log,$(TAO_ORBSVCS)))
-  IDL_SRCS += Logger
+ifneq (,$(findstring CosEvent,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosEventComm CosEventChannelAdmin
   TAO_ORBSVCS_SRCS += \
-        Log/Logger_i
-endif # Log
+        CosEvent/ConsumerAdmin_i \
+        CosEvent/SupplierAdmin_i \
+        CosEvent/EventChannel_i \
+        CosEvent/ProxyPushConsumer_i \
+        CosEvent/ProxyPushSupplier_i
+endif # CosEvent
 
-ifneq (,$(findstring Concurrency,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosConcurrencyControl
+ifneq (,$(findstring Event,$(TAO_ORBSVCS)))
+  IDL_SRCS += RtecEventComm RtecEventChannelAdmin RtecUDPAdmin
   TAO_ORBSVCS_SRCS += \
-        Concurrency/CC_Lock \
-        Concurrency/CC_LockSet \
-        Concurrency/CC_LockSetFactory \
-        Concurrency/Concurrency_Utils
-endif # Concurrency
-
-ifneq (,$(findstring LifeCycle,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosLifeCycle LifeCycleService
-  TAO_ORBSVCS_SRCS +=
-endif # LifeCycle
+        Event_Utilities \
+        Event/BCU \
+        Event/Dispatching_Modules \
+        Event/Event_Channel \
+        Event/Event_Manip \
+        Event/Local_ESTypes \
+        Event/Memory_Pools \
+        Event/RT_Task \
+        Event/ReactorTask \
+        Event/Timer_Module \
+        Event/EC_Gateway \
+        Event/EC_Gateway_UDP \
+        Event/EC_UDP_Admin \
+        Event/Module_Factory
 
-ifneq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-  IDL_SRCS += Ping ImplRepo
-  TAO_ORBSVCS_SRCS +=
-endif # ImplRepo
+  #### TAO's Event requires its Sched Service.
+  ifeq (,$(findstring Sched,$(TAO_ORBSVCS)))
+    TAO_ORBSVCS += Sched
+  endif # ! Sched
+endif # Event
 
-ifneq (,$(findstring Property,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosPropertyService
+ifneq (,$(findstring Sched,$(TAO_ORBSVCS)))
+  IDL_SRCS += RtecScheduler
   TAO_ORBSVCS_SRCS += \
-        Property/CosPropertyService_i\
-	Property/CosPropertyService_i_T
-endif # Property
+        Scheduler_Factory \
+        Runtime_Scheduler \
+        Scheduler_Utilities \
+        Sched/Config_Scheduler \
+        Sched/DynSched \
+        Sched/SchedEntry \
+        Sched/Scheduler \
+        Sched/Scheduler_Generic \
+        Sched/Strategy_Scheduler
+endif # Sched
 
 ifneq (,$(findstring Trader,$(TAO_ORBSVCS)))
   IDL_SRCS += CosTrading
@@ -151,87 +183,68 @@ ifneq (,$(findstring Trader,$(TAO_ORBSVCS)))
   endif # Naming
 endif # Trader
 
-ifneq (,$(findstring Sched,$(TAO_ORBSVCS)))
-  IDL_SRCS += RtecScheduler
+ifneq (,$(findstring Property,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosPropertyService
   TAO_ORBSVCS_SRCS += \
-        Scheduler_Factory \
-        Runtime_Scheduler \
-        Scheduler_Utilities \
-        Sched/Config_Scheduler \
-        Sched/DynSched \
-        Sched/SchedEntry \
-        Sched/Scheduler \
-        Sched/Scheduler_Generic \
-        Sched/Strategy_Scheduler
-endif # Sched
+        Property/CosPropertyService_i\
+        Property/CosPropertyService_i_T
+endif # Property
 
-ifneq (,$(findstring Event,$(TAO_ORBSVCS)))
-  IDL_SRCS += RtecEventComm RtecEventChannelAdmin RtecUDPAdmin
+ifneq (,$(findstring LifeCycle,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosLifeCycle LifeCycleService
+  TAO_ORBSVCS_SRCS +=
+endif # LifeCycle
+
+ifneq (,$(findstring Concurrency,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosConcurrencyControl
   TAO_ORBSVCS_SRCS += \
-        Event_Utilities \
-        Event/BCU \
-        Event/Dispatching_Modules \
-        Event/Event_Channel \
-        Event/Event_Manip \
-        Event/Local_ESTypes \
-        Event/Memory_Pools \
-        Event/RT_Task \
-        Event/ReactorTask \
-        Event/Timer_Module \
-        Event/EC_Gateway \
-        Event/EC_Gateway_UDP \
-        Event/EC_UDP_Admin \
-        Event/Module_Factory
-endif # Event
+        Concurrency/CC_Lock \
+        Concurrency/CC_LockSet \
+        Concurrency/CC_LockSetFactory \
+        Concurrency/Concurrency_Utils
+endif # Concurrency
 
-ifneq (,$(findstring Event2,$(TAO_ORBSVCS)))
+ifneq (,$(findstring Log,$(TAO_ORBSVCS)))
+  IDL_SRCS += Logger
   TAO_ORBSVCS_SRCS += \
-	Event/EC_Event_Channel \
-	Event/EC_ConsumerAdmin \
-	Event/EC_SupplierAdmin \
-	Event/EC_ProxyConsumer \
-	Event/EC_ProxySupplier \
-	Event/EC_SupplierFiltering \
-	Event/EC_Supplier_Filter_Builder \
-	Event/EC_Trivial_Supplier_Filter \
-	Event/EC_Filter \
-	Event/EC_Filter_Builder \
-	Event/EC_Dispatching \
-	Event/EC_Factory \
-	Event/EC_QOS_Info \
-	Event/EC_Null_Factory \
-	Event/EC_Disjunction_Filter \
-	Event/EC_Conjunction_Filter \
-	Event/EC_Type_Filter \
-	Event/EC_Basic_Filter_Builder \
-	Event/EC_Basic_Factory \
-	Event/EC_Default_Factory \
-	Event/EC_ObserverStrategy \
-	Event/EC_ProxyPushSupplier_Set \
-	Event/EC_Per_Supplier_Filter \
-	Event/EC_Timeout_Filter \
-	Event/EC_Timeout_Generator \
-	Event/EC_Reactive_Timeout_Generator
-endif # Event2
+        Log/Logger_i
+endif # Log
 
-ifneq (,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosEventComm CosEventChannelAdmin
+ifneq (,$(findstring Time,$(TAO_ORBSVCS)))
+  IDL_SRCS += TimeBase TimeService
   TAO_ORBSVCS_SRCS += \
-        CosEvent/ConsumerAdmin_i \
-        CosEvent/SupplierAdmin_i \
-        CosEvent/EventChannel_i \
-        CosEvent/ProxyPushConsumer_i \
-        CosEvent/ProxyPushSupplier_i
-endif # CosEvent
+        Time_Utilities \
+        Time/TAO_Time_Service_Server \
+        Time/TAO_Time_Service_Clerk \
+        Time/TAO_UTO \
+        Time/TAO_TIO \
+        Time/Timer_Helper
 
-ifneq (,$(findstring AV,$(TAO_ORBSVCS)))
-  IDL_SRCS += AVStreams Null_MediaCtrl sfp
+  #### TAO's Time Service requires its ImplRepo Service.
+  ifeq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
+    #### Add ImplRepo
+    TAO_ORBSVCS += ImplRepo
+  endif # ! ImplRepo
+endif # Time
+
+ifneq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
+  IDL_SRCS += Ping ImplRepo
+  TAO_ORBSVCS_SRCS +=
+endif # ImplRepo
+
+ifneq (,$(findstring Naming,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosNaming
   TAO_ORBSVCS_SRCS += \
-        AV/AVStreams_i \
-        AV/Endpoint_Strategy \
-        AV/Endpoint_Strategy_T\
-	AV/AVStreams_i_T
-endif # AV
+        IOR_Multicast \
+        Naming/Naming_Context \
+        Naming/Hash_Naming_Context \
+        Naming/Entries \
+        Naming/Persistent_Naming_Context \
+        Naming/Persistent_Entries \
+        Naming/Persistent_Bindings_Map \
+        Naming/Persistent_Context_Index \
+        Naming/Naming_Utils
+endif # Naming
 
 IDL_FILES = \
         $(addsuffix S, $(IDL_SRCS)) \
@@ -255,10 +268,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 LDFLAGS += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG) \
-	$(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
+        $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
 #
-# Extra dependencies not catched by make depend.
+# Extra dependencies not caught by make depend.
 #
 $(foreach ext, $(IDL_EXT), TimeService$(ext)): TimeBase.idl
 $(foreach ext, $(IDL_EXT), RtecScheduler$(ext)): TimeBase.idl
@@ -279,20 +292,16 @@ $(foreach ext, $(IDL_EXT), ImplRepo$(ext)): Ping.idl
 
 idl_stubs: $(addsuffix .h, $(IDL_FILES))
 
-clean:
-	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
-
 realclean: clean
-	-/bin/rm -rf $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
+	-$(RM) $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
 	@$(ACE_ROOT)/bin/ace_components --orbsvcs --remove
 
 .PHONY: ORBSVCS_COMPONENTS
 ORBSVCS_COMPONENTS:
-	@$(ACE_ROOT)/bin/ace_components --orbsvcs \
-         --set " $(TAO_ORBSVCS) "
+	@$(ACE_ROOT)/bin/ace_components --orbsvcs --set " $(TAO_ORBSVCS) "
 
 #----------------------------------------------------------------------------
-#	Dependencies
+#       Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.