ChangeLogTag:Tue Nov 28 15:56:01 2000 Carlos O'Ryan <coryan@uci.edu>

22 files changed, 272 insertions, 119 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 80debcd753d..370a0f8ea9a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,35 @@
+Tue Nov 28 15:56:01 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * examples/Load_Balancing/Makefile:
+        * examples/Load_Balancing_persistent/Makefile:
+        * examples/Logging/Makefile:
+        * examples/POA/Generic_Servant/Makefile:
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile:
+        * tests/Exposed_Policies/Makefile:
+	  Don't use override with TAO_IDLFLAGS because sometimes they are
+	  set globally, for example to set the location of gperf.
+
+        * TAO_IDL/Makefile.BE:
+	  Update dependencies
+
+        * orbsvcs/CosEvent_Service/Makefile:
+        * orbsvcs/examples/CosEC/Factory/Makefile:
+        * orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile:
+        * orbsvcs/examples/CosEC/Simple/Makefile:
+        * orbsvcs/examples/RtEC/MCast/Makefile:
+        * orbsvcs/examples/RtEC/Simple/Makefile:
+        * orbsvcs/tests/CosEvent/Basic/Makefile:
+        * orbsvcs/tests/EC_Mcast/Makefile:
+        * orbsvcs/tests/EC_Throughput/Makefile:
+        * orbsvcs/tests/Event/Basic/Makefile:
+        * orbsvcs/tests/Event/Performance/Makefile:
+        * orbsvcs/tests/Event/lib/Makefile:
+	  The RT event service and the CosEvent service fail to compiler
+	  under gcc-2.7.2, thus their tests and examples should be
+	  disabled too.
+
 Tue Nov 28 12:03:34 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
 	* tao/MessagingC.cpp:
diff --git a/TAO/TAO_IDL/Makefile.BE b/TAO/TAO_IDL/Makefile.BE
index 5e25e8b8ba8..46e4f87c834 100644
--- a/TAO/TAO_IDL/Makefile.BE
+++ b/TAO/TAO_IDL/Makefile.BE
@@ -1735,7 +1735,22 @@ realclean: clean
  be_include/be_visitor_interface/interceptors_ch.h \
  be_include/be_visitor_interface/interceptors_cs.h \
  be_include/be_visitor_interface/interceptors_sh.h \
- be_include/be_visitor_interface/interceptors_ss.h be_include/be.h \
+ be_include/be_visitor_interface/interceptors_ss.h \
+ be_include/be_visitor_interface/proxy_brokers_ch.h \
+ be_include/be_visitor_interface/base_proxy_broker_ch.h \
+ be_include/be_visitor_interface/remote_proxy_broker_ch.h \
+ be_include/be_visitor_interface/remote_proxy_broker_cs.h \
+ be_include/be_visitor_interface/strategized_proxy_broker_sh.h \
+ be_include/be_visitor_interface/strategized_proxy_broker_ss.h \
+ be_include/be_visitor_interface/proxy_impls_ch.h \
+ be_include/be_visitor_interface/base_proxy_impl_ch.h \
+ be_include/be_visitor_interface/remote_proxy_impl_ch.h \
+ be_include/be_visitor_interface/remote_proxy_impl_cs.h \
+ be_include/be_visitor_interface/thru_poa_proxy_impl_sh.h \
+ be_include/be_visitor_interface/thru_poa_proxy_impl_ss.h \
+ be_include/be_visitor_interface/direct_proxy_impl_sh.h \
+ be_include/be_visitor_interface/direct_proxy_impl_ss.h \
+ be_include/be.h \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
@@ -5820,6 +5835,20 @@ realclean: clean
  be_include/be_visitor_interface/interceptors_cs.h \
  be_include/be_visitor_interface/interceptors_sh.h \
  be_include/be_visitor_interface/interceptors_ss.h \
+ be_include/be_visitor_interface/proxy_brokers_ch.h \
+ be_include/be_visitor_interface/base_proxy_broker_ch.h \
+ be_include/be_visitor_interface/remote_proxy_broker_ch.h \
+ be_include/be_visitor_interface/remote_proxy_broker_cs.h \
+ be_include/be_visitor_interface/strategized_proxy_broker_sh.h \
+ be_include/be_visitor_interface/strategized_proxy_broker_ss.h \
+ be_include/be_visitor_interface/proxy_impls_ch.h \
+ be_include/be_visitor_interface/base_proxy_impl_ch.h \
+ be_include/be_visitor_interface/remote_proxy_impl_ch.h \
+ be_include/be_visitor_interface/remote_proxy_impl_cs.h \
+ be_include/be_visitor_interface/thru_poa_proxy_impl_sh.h \
+ be_include/be_visitor_interface/thru_poa_proxy_impl_ss.h \
+ be_include/be_visitor_interface/direct_proxy_impl_sh.h \
+ be_include/be_visitor_interface/direct_proxy_impl_ss.h \
  be_include/be_visitor_interface_fwd.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ch.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ci.h \
@@ -5900,6 +5929,12 @@ realclean: clean
  be_include/be_visitor_operation/interceptors_exceptlist.h \
  be_include/be_visitor_operation/interceptors_info_rettype.h \
  be_include/be_visitor_operation/interceptors_result.h \
+ be_include/be_visitor_operation/base_proxy_impl_ch.h \
+ be_include/be_visitor_operation/proxy_impl_xh.h \
+ be_include/be_visitor_operation/inv_arglist.h \
+ be_include/be_visitor_operation/remote_proxy_impl_cs.h \
+ be_include/be_visitor_operation/thru_poa_proxy_impl_ss.h \
+ be_include/be_visitor_operation/direct_proxy_impl_ss.h \
  be_include/be_visitor_root.h be_include/be_visitor_root/root.h \
  be_include/be_visitor_root/root_ch.h \
  be_include/be_visitor_root/root_ci.h \
@@ -7856,6 +7891,20 @@ realclean: clean
  be_include/be_visitor_interface/interceptors_cs.h \
  be_include/be_visitor_interface/interceptors_sh.h \
  be_include/be_visitor_interface/interceptors_ss.h \
+ be_include/be_visitor_interface/proxy_brokers_ch.h \
+ be_include/be_visitor_interface/base_proxy_broker_ch.h \
+ be_include/be_visitor_interface/remote_proxy_broker_ch.h \
+ be_include/be_visitor_interface/remote_proxy_broker_cs.h \
+ be_include/be_visitor_interface/strategized_proxy_broker_sh.h \
+ be_include/be_visitor_interface/strategized_proxy_broker_ss.h \
+ be_include/be_visitor_interface/proxy_impls_ch.h \
+ be_include/be_visitor_interface/base_proxy_impl_ch.h \
+ be_include/be_visitor_interface/remote_proxy_impl_ch.h \
+ be_include/be_visitor_interface/remote_proxy_impl_cs.h \
+ be_include/be_visitor_interface/thru_poa_proxy_impl_sh.h \
+ be_include/be_visitor_interface/thru_poa_proxy_impl_ss.h \
+ be_include/be_visitor_interface/direct_proxy_impl_sh.h \
+ be_include/be_visitor_interface/direct_proxy_impl_ss.h \
  be/be_visitor_interface/interface.cpp \
  be/be_visitor_interface/interface_ch.cpp \
  be/be_visitor_interface/interface_ci.cpp \
@@ -7881,7 +7930,21 @@ realclean: clean
  be/be_visitor_interface/interceptors_ch.cpp \
  be/be_visitor_interface/interceptors_cs.cpp \
  be/be_visitor_interface/interceptors_sh.cpp \
- be/be_visitor_interface/interceptors_ss.cpp
+ be/be_visitor_interface/interceptors_ss.cpp \
+ be/be_visitor_interface/base_proxy_broker_ch.cpp \
+ be/be_visitor_interface/proxy_brokers_ch.cpp \
+ be/be_visitor_interface/remote_proxy_broker_ch.cpp \
+ be/be_visitor_interface/remote_proxy_broker_cs.cpp \
+ be/be_visitor_interface/strategized_proxy_broker_sh.cpp \
+ be/be_visitor_interface/strategized_proxy_broker_ss.cpp \
+ be/be_visitor_interface/proxy_impls_ch.cpp \
+ be/be_visitor_interface/base_proxy_impl_ch.cpp \
+ be/be_visitor_interface/remote_proxy_impl_ch.cpp \
+ be/be_visitor_interface/remote_proxy_impl_cs.cpp \
+ be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp \
+ be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp \
+ be/be_visitor_interface/direct_proxy_impl_sh.cpp \
+ be/be_visitor_interface/direct_proxy_impl_ss.cpp
 
 .obj/be_visitor_interface_fwd.o .obj/be_visitor_interface_fwd.so .shobj/be_visitor_interface_fwd.o .shobj/be_visitor_interface_fwd.so: be/be_visitor_interface_fwd.cpp \
  include/idl.h \
@@ -8261,6 +8324,12 @@ realclean: clean
  be_include/be_visitor_operation/interceptors_exceptlist.h \
  be_include/be_visitor_operation/interceptors_info_rettype.h \
  be_include/be_visitor_operation/interceptors_result.h \
+ be_include/be_visitor_operation/base_proxy_impl_ch.h \
+ be_include/be_visitor_operation/proxy_impl_xh.h \
+ be_include/be_visitor_operation/inv_arglist.h \
+ be_include/be_visitor_operation/remote_proxy_impl_cs.h \
+ be_include/be_visitor_operation/thru_poa_proxy_impl_ss.h \
+ be_include/be_visitor_operation/direct_proxy_impl_ss.h \
  be/be_visitor_valuetype/field_ch.cpp \
  be/be_visitor_valuetype/field_ci.cpp \
  be/be_visitor_valuetype/field_cs.cpp \
@@ -8773,6 +8842,12 @@ realclean: clean
  be_include/be_visitor_operation/interceptors_exceptlist.h \
  be_include/be_visitor_operation/interceptors_info_rettype.h \
  be_include/be_visitor_operation/interceptors_result.h \
+ be_include/be_visitor_operation/base_proxy_impl_ch.h \
+ be_include/be_visitor_operation/proxy_impl_xh.h \
+ be_include/be_visitor_operation/inv_arglist.h \
+ be_include/be_visitor_operation/remote_proxy_impl_cs.h \
+ be_include/be_visitor_operation/thru_poa_proxy_impl_ss.h \
+ be_include/be_visitor_operation/direct_proxy_impl_ss.h \
  be/be_visitor_operation/operation.cpp \
  be/be_visitor_operation/arglist.cpp \
  be/be_visitor_operation/argument.cpp \
@@ -8830,7 +8905,13 @@ realclean: clean
  be/be_visitor_operation/interceptors_ss.cpp \
  be/be_visitor_operation/interceptors_exceptlist.cpp \
  be/be_visitor_operation/interceptors_info_rettype.cpp \
- be/be_visitor_operation/interceptors_result.cpp
+ be/be_visitor_operation/interceptors_result.cpp \
+ be/be_visitor_operation/base_proxy_impl_ch.cpp \
+ be/be_visitor_operation/proxy_impl_xh.cpp \
+ be/be_visitor_operation/inv_arglist.cpp \
+ be/be_visitor_operation/remote_proxy_impl_cs.cpp \
+ be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp \
+ be/be_visitor_operation/direct_proxy_impl_ss.cpp
 
 .obj/be_visitor_root.o .obj/be_visitor_root.so .shobj/be_visitor_root.o .shobj/be_visitor_root.so: be/be_visitor_root.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
diff --git a/TAO/examples/Load_Balancing/Makefile b/TAO/examples/Load_Balancing/Makefile
index 90998ec3cb3..ff1c37a1970 100644
--- a/TAO/examples/Load_Balancing/Makefile
+++ b/TAO/examples/Load_Balancing/Makefile
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-override TAO_IDLFLAGS += -Ge 1
+TAO_IDLFLAGS += -Ge 1
 
 LDLIBS = -lTAO_PortableServer -lTAO
 
diff --git a/TAO/examples/Load_Balancing_persistent/Makefile b/TAO/examples/Load_Balancing_persistent/Makefile
index 0ab718153e7..415bf1f9087 100755
--- a/TAO/examples/Load_Balancing_persistent/Makefile
+++ b/TAO/examples/Load_Balancing_persistent/Makefile
@@ -7,7 +7,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-override TAO_IDLFLAGS += -Ge 1
+TAO_IDLFLAGS += -Ge 1
 LDLIBS = -lTAO_PortableServer -lTAO
 
 IDL_FILES = Load_Balancer Identity
diff --git a/TAO/examples/Logging/Makefile b/TAO/examples/Logging/Makefile
index a8de03e7578..a4454f05264 100644
--- a/TAO/examples/Logging/Makefile
+++ b/TAO/examples/Logging/Makefile
@@ -6,7 +6,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # TAO_ROOT
 
-override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Ge 1
+TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Ge 1
 
 # The following lines tell the souce code that the trading
 # service is available.
diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile
index 345dab4799a..749aeb021df 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile
+++ b/TAO/examples/POA/Generic_Servant/Makefile
@@ -14,8 +14,9 @@ endif # ! TAO_ROOT
 
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
-override TAO_IDLFLAGS += -Wb,export_macro=GENERIC_SERVANT_Export \
-                         -Wb,export_include=generic_servant_export.h -Ge 1
+TAO_IDLFLAGS += -Wb,export_macro=GENERIC_SERVANT_Export \
+                -Wb,export_include=generic_servant_export.h \
+		-Ge 1
 
 LDLIBS = -lTAO_PortableServer -lTAO
 
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index f62539f2bcb..2dfc246812d 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -14,13 +14,6 @@ LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lT
 
 BIN_UNCHECKED = CosEvent_Service
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
-    BIN = $(BIN_UNCHECKED)
-endif # CosEvent
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -28,6 +21,16 @@ endif # CosEvent
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### 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 = $(BIN_UNCHECKED)
+  endif # ACE_HAS_GNUG_PRE_2_8
+endif # CosEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
index 6a121fa068d..9741cad783e 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
@@ -40,22 +40,25 @@ CLIENT_OBJS = \
 BIN2 = factory \
 	factoryclient
 
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-    BIN = $(BIN2)
+    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
+      BIN = $(BIN2)
+    endif # ACE_HAS_GNUG_PRE_2_8
   endif # Naming
 endif # CosEvent
 
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-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
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
index f490c85f45e..0127a3b9a67 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
@@ -14,22 +14,25 @@ LDLIBS = -lTAO_RTEC_COSEC -lTAO_CosEvent -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc
 
 BIN2 = RtEC_Based_CosEC
 
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-    BIN = $(BIN2)
+    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
+      BIN = $(BIN2)
+    endif # ACE_HAS_GNUG_PRE_2_8
   endif # RTEvent
 endif # CosEvent
 
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-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
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
index ec8085a8be8..6a8c312784a 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
@@ -16,13 +16,6 @@ CPPFLAGS += -I../../lib \
 
 BIN2 = Basic
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # RTEvent
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -30,6 +23,16 @@ endif # RTEvent
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### 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
+endif # RTEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
index cd619c6fb24..8b712757934 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
@@ -31,13 +31,6 @@ SIMPLE_SUP_OBJS = \
 BIN2 = Supplier \
        Consumer
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # CosEvent
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -45,6 +38,16 @@ endif # CosEvent
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### 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
+endif # CosEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile b/TAO/orbsvcs/examples/CosEC/Simple/Makefile
index f0f2289e9dc..57395c3c89c 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile
@@ -16,13 +16,6 @@ BIN2 =   Service \
 	Consumer \
 	Supplier
 
-#### If the orbsvcs library wasn't built with all components, don't
-#### try to build certain tests.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # NativeCosEvent
-
 PSRC=$(addsuffix .cpp,$(BIN2))
 LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
@@ -35,6 +28,16 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the orbsvcs library wasn't built with all components, don't
+#### 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
+endif # NativeCosEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
index 3f0706d963d..1c26c1bfc52 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
@@ -14,13 +14,6 @@ endif # ! TAO_ROOT
 
 BIN2 =  MCast
 
-#### If the orbsvcs library wasn't built with all components, don't
-#### try to build certain tests.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # RTEvent
-
 SRC=MCast.cpp Consumer.cpp Supplier.cpp AddrServer.cpp
 LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
@@ -33,6 +26,16 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the orbsvcs library wasn't built with all components, don't
+#### 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
+endif # RTEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
index 4338a6423c7..437751b98f0 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
@@ -16,13 +16,6 @@ BIN2 =   Service \
 	Consumer \
 	Supplier
 
-#### If the orbsvcs library wasn't built with all components, don't
-#### try to build certain tests.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # RTEvent
-
 PSRC=$(addsuffix .cpp,$(BIN2))
 LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
@@ -35,6 +28,16 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the orbsvcs library wasn't built with all components, don't
+#### 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
+endif # RTEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
index 1266642e18d..1da6e69fd46 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
@@ -20,13 +20,6 @@ BIN2 =  \
 	Shutdown \
 	Random
 
-#### If the orbsvcs library wasn't built with all components, don't
-#### try to build certain tests.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # NativeCosEvent
-
 PSRC=$(addsuffix .cpp,$(BIN2))
 LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
@@ -40,6 +33,16 @@ CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the orbsvcs library wasn't built with all components, don't
+#### 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
+endif # NativeCosEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index d671e033ae2..7f4be6feb3d 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -12,13 +12,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
 
 BIN2 = EC_Mcast
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # RTEvent
-
 PSRC=EC_Mcast.cpp
 
 #----------------------------------------------------------------------------
@@ -28,6 +21,16 @@ PSRC=EC_Mcast.cpp
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### 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
+endif # RTEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index c47dcdd0322..a733c00b42b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -19,22 +19,25 @@ SRC = $(addsuffix .cpp, $(BIN)) \
 
 BIN2 = ECT_Supplier ECT_Consumer ECT_Throughput
 
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTOLDEvent,$(findstring RTOLDEvent,$(TAO_ORBSVCS)))
   ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-    BIN = $(BIN2)
+    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
+      BIN = $(BIN2)
+    endif # ACE_HAS_GNUG_PRE_2_8
   endif # Naming
 endif # RTOLDEvent
 
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-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
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
index e5d5d7f7fe2..b8546448c9f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile
@@ -28,13 +28,6 @@ BIN2 =   Reconnect \
 	Control \
 	Random
 
-#### If the orbsvcs library wasn't built with all components, don't
-#### try to build certain tests.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # RTEvent
-
 PSRC=$(addsuffix .cpp,$(BIN2)) Schedule.cpp
 LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
@@ -47,6 +40,16 @@ CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the orbsvcs library wasn't built with all components, don't
+#### 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
+endif # RTEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
@@ -64,11 +67,13 @@ endif
 #----------------------------------------------------------------------------
 
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
+  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
 
 all: Schedule
 
 Schedule: $(addprefix $(VDIR),Schedule.o)
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_RTSched -lTAO_CosNaming $(VLDLIBS) $(POSTLINK)
+  endif # ACE_HAS_GNUG_PRE_2_8
 endif # RTEvent
 
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index b278fa1c2ab..9d746f92d67 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -18,13 +18,6 @@ BIN2 =  Throughput \
 	Latency \
 	Latency_Server
 
-#### If the orbsvcs library wasn't built with all components, don't
-#### try to build certain tests.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # RTEvent
-
 PSRC=$(addsuffix .cpp,$(BIN2))
 LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
@@ -38,6 +31,16 @@ CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the orbsvcs library wasn't built with all components, don't
+#### 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
+endif # RTEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile
index ab9ac2f9b39..3a5367fa29a 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile
@@ -13,12 +13,6 @@ LIBNAME  = libECTests
 LIB2      = $(LIBNAME).a
 SHLIB2    = $(LIBNAME).$(SOEXT)
 
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-endif # RTEvent
-
 ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO -lACE
 LDLIBS  = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO
 
@@ -35,6 +29,15 @@ LSRC  = $(addsuffix .cpp,$(FILES))
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
+  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
+    LIB = $(LIB2)
+    SHLIB = $(SHLIB2)
+  endif # ACE_HAS_GNUG_PRE_2_8
+endif # RTEvent
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile
index dd011e8af30..5ad35c96b7a 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile
@@ -14,7 +14,7 @@ endif # ! TAO_ROOT
 
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
-override TAO_IDLFLAGS +=\
+TAO_IDLFLAGS +=\
  -Wb,export_macro=RTCORBA_COMMON_Export \
  -Wb,export_include=rtcorba_common_export.h \
  -Ge 1
diff --git a/TAO/tests/Exposed_Policies/Makefile b/TAO/tests/Exposed_Policies/Makefile
index 75a3057d6eb..bc5f734e936 100644
--- a/TAO/tests/Exposed_Policies/Makefile
+++ b/TAO/tests/Exposed_Policies/Makefile
@@ -65,8 +65,6 @@ realclean: clean
 .obj/Policy_Tester.o .obj/Policy_Tester.so .shobj/Policy_Tester.o .shobj/Policy_Tester.so: Policy_Tester.cpp Policy_Tester.h RT_Properties.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -223,6 +221,7 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -398,8 +397,6 @@ realclean: clean
 .obj/Policy_Verifier.o .obj/Policy_Verifier.so .shobj/Policy_Verifier.o .shobj/Policy_Verifier.so: Policy_Verifier.cpp Policy_Verifier.h CounterC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -556,6 +553,7 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -723,8 +721,6 @@ realclean: clean
 .obj/RT_Properties.o .obj/RT_Properties.so .shobj/RT_Properties.o .shobj/RT_Properties.so: RT_Properties.cpp RT_Properties.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -881,6 +877,7 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -1046,8 +1043,6 @@ realclean: clean
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp CounterC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -1204,6 +1199,7 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -1371,8 +1367,6 @@ realclean: clean
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Policy_Tester.h RT_Properties.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -1529,6 +1523,7 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \