8 files changed, 12 insertions, 33 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
index 87b1e4d091c..02e1a64f934 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
@@ -53,9 +53,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-      BIN = $(BIN2)
-    endif # ACE_HAS_GNUG_PRE_2_8
+    BIN = $(BIN2)
   endif # Naming
 endif # CosEvent
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
index 69035aae55d..65a444da5e0 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
@@ -27,9 +27,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-      BIN = $(BIN2)
-    endif # ACE_HAS_GNUG_PRE_2_8
+    BIN = $(BIN2)
   endif # RTEvent
 endif # CosEvent
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
index f535b9f8edc..5f71c8a7d34 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
@@ -28,9 +28,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
index 747d4082195..6cba3879b58 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
@@ -43,9 +43,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # CosEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile b/TAO/orbsvcs/examples/CosEC/Simple/Makefile
index 1c7d46e0aae..b59d7027aa5 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile
@@ -33,9 +33,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### try to build certain tests.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # NativeCosEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
index 13a5200b9b8..24f2d03322b 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
@@ -31,9 +31,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### try to build certain tests.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile
index 7ef7a8eaa91..96e2d40b0c6 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile
@@ -39,18 +39,11 @@ Service_OBJS=$(addsuffix .o, Service Supplier Consumer)
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-  # This example does not compile with g++ 2.7.2.3
-all clean realclean:
-	@echo orbsvcs/examples/RtEC/Schedule is not built with older versions of g++
-else # ! ACE_HAS_GNUG_PRE_2_8
-  include $(ACE_ROOT)/include/makeinclude/macros.GNU
-  include $(TAO_ROOT)/rules.tao.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-endif # ! ACE_HAS_GNUG_PRE_2_8
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # To build multiple executables in the same directory on AIX, it works
 # best to wipe out any previously-created tempinc directory.
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
index ee711c4171b..bc1af478690 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
@@ -33,9 +33,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### try to build certain tests.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU