summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/Event_Service
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-05-15 18:12:28 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-05-15 18:12:28 +0000
commit24693a1d3bfffc383bbfe163a18906848dac428f (patch)
tree77f01cf9569f4db12a385801a512498e079764be /TAO/orbsvcs/Event_Service
parent13f26363e2a2a35a96d3798034bf1120f4163eca (diff)
downloadATCD-24693a1d3bfffc383bbfe163a18906848dac428f.tar.gz
ChangeLogTag:Mon May 15 11:08:52 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/orbsvcs/Event_Service')
-rw-r--r--TAO/orbsvcs/Event_Service/Makefile13
1 files changed, 5 insertions, 8 deletions
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index 5624c2e93c7..fea54c8bb29 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -14,13 +14,9 @@ BIN2 = Event_Service
#### If the TAO orbsvcs library wasn't built with sufficient components,
#### don't try to build here.
TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
- ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
- ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
- BIN = $(BIN2)
- endif # Naming
- endif # Event
-endif # Event2
+ifeq (RTOLDEvent,$(findstring RTOLDEvent,$(TAO_ORBSVCS)))
+ BIN = $(BIN2)
+endif # RTOLDEvent
#----------------------------------------------------------------------------
# Include macros and targets
@@ -145,6 +141,7 @@ endif # LYNXTARGET == ppc
$(TAO_ROOT)/tao/try_macros.h \
$(TAO_ROOT)/tao/orbconf.h \
$(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
$(TAO_ROOT)/tao/corbafwd.i \
$(TAO_ROOT)/tao/CDR.i \
$(TAO_ROOT)/tao/Environment.h \
@@ -392,6 +389,7 @@ endif # LYNXTARGET == ppc
$(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
@@ -411,7 +409,6 @@ endif # LYNXTARGET == ppc
$(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \