ChangeLogTag:Fri Mar 24 22:24:10 2000 Carlos O'Ryan <coryan@uci.edu>

13 files changed, 39 insertions, 17 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 60d8a595bda..81d2fed09db 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,21 @@
+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:
+	* orbsvcs/orbsvcs/Makefile.CosProperty:
+	* orbsvcs/orbsvcs/Makefile.CosTime:
+	* orbsvcs/orbsvcs/Makefile.CosTrading:
+	* orbsvcs/orbsvcs/Makefile.DsLogAdmin:
+	* orbsvcs/orbsvcs/Makefile.RTSched:
+	* orbsvcs/orbsvcs/Makefile.Svc_Utils:
+	  Set the MAKEFILE macro properly.
+
+	* orbsvcs/orbsvcs/Makefile.RTEvent:
+	  Disabled the new EC on old versions of g++.
+
 Fri Mar 24 22:18:14 2000  Carlos O'Ryan  <coryan@uci.edu>
 
 	* orbsvcs/Naming_Service/Makefile:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency b/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency
index cd41d8dee2a..530f139199e 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.CosConcurrency
 LIBNAME  = libTAO_CosConcurrency
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
index 4e69770982d..ddb2d480e42 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.CosEvent
 LIBNAME  = libTAO_CosEvent
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosLifeCycle b/TAO/orbsvcs/orbsvcs/Makefile.CosLifeCycle
index 9f7d1dec89f..fae93960642 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosLifeCycle
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosLifeCycle
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.CosLifeCycle
 LIBNAME  = libTAO_CosLifeCycle
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNaming b/TAO/orbsvcs/orbsvcs/Makefile.CosNaming
index 9164aea3551..50b0f05a108 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosNaming
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNaming
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.CosNaming
 LIBNAME  = libTAO_CosNaming
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification
index fec2d7f9193..d5a0c12bae1 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.CosNotification
 LIBNAME  = libTAO_CosNotification
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosProperty b/TAO/orbsvcs/orbsvcs/Makefile.CosProperty
index dc359369246..52ef855e008 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosProperty
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosProperty
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.CosProperty
 LIBNAME  = libTAO_CosProperty
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosTime b/TAO/orbsvcs/orbsvcs/Makefile.CosTime
index a96a5eb7b3a..6afeff1f0cc 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosTime
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosTime
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.CosTime
 LIBNAME  = libTAO_CosTime
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosTrading b/TAO/orbsvcs/orbsvcs/Makefile.CosTrading
index 8f51968051f..4f4a59d08ce 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosTrading
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosTrading
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.CosTrading
 LIBNAME  = libTAO_CosTrading
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin b/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin
index 6fa87425409..7719b91c3e8 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin
+++ b/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.DsLogAdmin
 LIBNAME  = libTAO_DsLogAdmin
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
index 0a3656a6154..2206f10d892 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.RTEvent
 LIBNAME  = libTAO_RTEvent
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
@@ -38,6 +38,8 @@ IDL_SRCS += \
     RtecEventComm \
     RtecEventChannelAdmin \
     RtecUDPAdmin
+
+ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
 CPP_SRCS += \
         Event/EC_Event_Channel \
         Event/EC_ConsumerAdmin \
@@ -80,9 +82,14 @@ CPP_SRCS += \
         Event/EC_Bitmask_Filter \
         Event/EC_Masked_Type_Filter \
         Event/EC_Prefix_Filter_Builder \
-        Event/EC_And_Filter \
-	\
+        Event/EC_And_Filter
+endif # ACE_HAS_GNUG_PRE_2_8
+
+CPP_SRCS += \
         Event_Utilities \
+        Event/EC_Gateway \
+        Event/EC_Gateway_UDP \
+        Event/EC_UDP_Admin \
         Event/BCU \
         Event/Dispatching_Modules \
         Event/Event_Channel \
@@ -92,9 +99,6 @@ CPP_SRCS += \
         Event/RT_Task \
         Event/ReactorTask \
         Event/Timer_Module \
-        Event/EC_Gateway \
-        Event/EC_Gateway_UDP \
-        Event/EC_UDP_Admin \
         Event/Module_Factory
 
 IDL_FILES = \
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTSched b/TAO/orbsvcs/orbsvcs/Makefile.RTSched
index 920277c9cd2..56790fdf6b5 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RTSched
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RTSched
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.RTSched
 LIBNAME  = libTAO_RTSched
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils b/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils
index 26a0eac79cd..ffa3de3472c 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils
+++ b/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-MAKEFILE = Makefile
+MAKEFILE = Makefile.Svc_Utils
 LIBNAME  = libTAO_Svc_Utils
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)