summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/Event_Service/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/Event_Service/Makefile')
-rw-r--r--TAO/orbsvcs/Event_Service/Makefile81
1 files changed, 32 insertions, 49 deletions
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index 62c42cef9a2..8f505f8160d 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -1,36 +1,30 @@
+#
# $Id$
+#
-LSRC = Event_Service.cpp
-ES_OBJS=$(LSRC:.cpp=.o)
+BIN = Event_Service
-LDLIBS = -lorbsvcs -lTAO
-BIN2 = Event_Service
+LSRC = \
+ Event_Service.cpp \
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(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
+ES_OBJS=$(LSRC:.cpp=.o)
+
+LDLIBS = -lorbsvcs -lTAO
#----------------------------------------------------------------------------
-# Include macros and targets
+# Include macros and targets
#----------------------------------------------------------------------------
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
ifndef TAO_ROOT
- TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
endif
TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
@@ -40,7 +34,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
#----------------------------------------------------------------------------
-# Dependencies
+# Dependencies
#----------------------------------------------------------------------------
# DO NOT DELETE THIS LINE -- g++dep uses it.
@@ -119,7 +113,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
$(TAO_ROOT)/tao/try_macros.h \
$(TAO_ROOT)/tao/orbconf.h \
$(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
$(TAO_ROOT)/tao/Typecode.h \
$(TAO_ROOT)/tao/Exception.h \
$(TAO_ROOT)/tao/Exception.i \
@@ -127,8 +120,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
$(TAO_ROOT)/tao/CDR.i \
$(TAO_ROOT)/tao/Environment.h \
$(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
$(TAO_ROOT)/tao/Any.i \
$(TAO_ROOT)/tao/TimeBaseC.i \
$(TAO_ROOT)/tao/TimeBaseS_T.h \
@@ -165,30 +156,30 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
$(ACE_ROOT)/ace/Reactor.i \
$(ACE_ROOT)/ace/Reactor_Impl.h \
$(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
$(TAO_ROOT)/tao/ORB.i \
$(TAO_ROOT)/tao/NVList.h \
$(TAO_ROOT)/tao/NVList.i \
$(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
$(TAO_ROOT)/tao/Principal.i \
$(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
$(TAO_ROOT)/tao/Request.i \
$(TAO_ROOT)/tao/Server_Request.h \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
$(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
$(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
$(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
$(TAO_ROOT)/tao/varout.h \
$(TAO_ROOT)/tao/varout.i \
$(TAO_ROOT)/tao/varout.cpp \
@@ -211,8 +202,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
$(TAO_ROOT)/tao/POA_CORBA.h \
$(TAO_ROOT)/tao/DynAnyC.h \
$(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/POAS.i \
$(TAO_ROOT)/tao/Active_Object_Map.h \
$(TAO_ROOT)/tao/Key_Adapters.h \
@@ -304,7 +293,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
$(TAO_ROOT)/tao/POA.i \
$(TAO_ROOT)/tao/Stub.h \
$(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
$(TAO_ROOT)/tao/MProfile.h \
$(TAO_ROOT)/tao/MProfile.i \
$(TAO_ROOT)/tao/Stub.i \
@@ -327,13 +315,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
$(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
$(TAO_ROOT)/tao/DynAny_i.h \
$(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -411,10 +392,12 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
$(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Null_Factory.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Null_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i