From 766d0cbd4d00d151864b2209773ed62c3b068847 Mon Sep 17 00:00:00 2001 From: coryan Date: Sat, 25 Mar 2000 06:27:23 +0000 Subject: ChangeLogTag:Fri Mar 24 22:24:10 2000 Carlos O'Ryan --- TAO/ChangeLogs/ChangeLog-02a | 2 +- TAO/orbsvcs/orbsvcs/Makefile.CosEvent | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 81d2fed09db..aa8641f5a17 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,7 +1,6 @@ Fri Mar 24 22:24:10 2000 Carlos O'Ryan * orbsvcs/orbsvcs/Makefile.CosConcurrency: - * orbsvcs/orbsvcs/Makefile.CosEvent: * orbsvcs/orbsvcs/Makefile.CosLifeCycle: * orbsvcs/orbsvcs/Makefile.CosNaming: * orbsvcs/orbsvcs/Makefile.CosNotification: @@ -13,6 +12,7 @@ Fri Mar 24 22:24:10 2000 Carlos O'Ryan * orbsvcs/orbsvcs/Makefile.Svc_Utils: Set the MAKEFILE macro properly. + * orbsvcs/orbsvcs/Makefile.CosEvent: * orbsvcs/orbsvcs/Makefile.RTEvent: Disabled the new EC on old versions of g++. diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent index ddb2d480e42..b40e1a535a8 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent @@ -33,13 +33,8 @@ override TAO_IDLFLAGS += \ -Wb,post_include=ace/post.h IDL_SRCS += CosEventComm CosEventChannelAdmin +ifneq ($(ACE_HAS_GNUG_PRE_2_8),1) CPP_SRCS += \ - CosEvent/ConsumerAdmin_i \ - CosEvent/SupplierAdmin_i \ - CosEvent/EventChannel_i \ - CosEvent/ProxyPushConsumer_i \ - CosEvent/ProxyPushSupplier_i \ - CosEvent_Utilities \ CosEvent/CEC_ConsumerAdmin \ CosEvent/CEC_ConsumerControl \ CosEvent/CEC_Dispatching \ @@ -58,6 +53,15 @@ CPP_SRCS += \ CosEvent/CEC_Pulling_Strategy \ CosEvent/CEC_Reactive_Pulling_Strategy \ CosEvent/CEC_Default_Factory +endif # ACE_HAS_GNUG_PRE_2_8 + +CPP_SRCS += \ + CosEvent/ConsumerAdmin_i \ + CosEvent/SupplierAdmin_i \ + CosEvent/EventChannel_i \ + CosEvent/ProxyPushConsumer_i \ + CosEvent/ProxyPushSupplier_i \ + CosEvent_Utilities IDL_FILES = \ $(addsuffix S, $(IDL_SRCS)) \ -- cgit v1.2.1