diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-25 06:27:23 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-25 06:27:23 +0000 |
| commit | 766d0cbd4d00d151864b2209773ed62c3b068847 (patch) | |
| tree | 937abec7c57c797564094ec6c05932e48129f22e | |
| parent | 41d83b961b11ef86adebf9d117b371ca491cd564 (diff) | |
| download | ATCD-766d0cbd4d00d151864b2209773ed62c3b068847.tar.gz | |
ChangeLogTag:Fri Mar 24 22:24:10 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 2 | ||||
| -rw-r--r-- | 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 <coryan@uci.edu> * 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 <coryan@uci.edu> * 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)) \ |