diff options
Diffstat (limited to 'TAO/orbsvcs/CosEvent_Service/Makefile')
| -rw-r--r-- | TAO/orbsvcs/CosEvent_Service/Makefile | 53 |
1 files changed, 17 insertions, 36 deletions
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile index b6190d7cc0f..1393a37c5dd 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile +++ b/TAO/orbsvcs/CosEvent_Service/Makefile @@ -14,9 +14,7 @@ BIN2 = CosEvent_Service #### don't try to build here. TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) - ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) - BIN = $(BIN2) - endif # Event2 + BIN = $(BIN2) endif # CosEvent #---------------------------------------------------------------------------- @@ -52,6 +50,7 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -118,7 +117,6 @@ CosEvent_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/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -151,38 +149,36 @@ CosEvent_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/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.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 \ @@ -203,10 +199,10 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ $(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 \ @@ -298,19 +294,17 @@ CosEvent_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 \ $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.i \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/IIOP_Acceptor.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -321,13 +315,6 @@ CosEvent_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/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -442,12 +429,6 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \ - $(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 + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY |