diff options
Diffstat (limited to 'TAO/examples')
| -rw-r--r-- | TAO/examples/Event_Comm/Makefile | 12 | ||||
| -rw-r--r-- | TAO/examples/POA/TIE/Makefile | 13 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Makefile | 12 | ||||
| -rw-r--r-- | TAO/examples/TypeCode_Creation/Makefile | 4 |
4 files changed, 3 insertions, 38 deletions
diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile index f4e280a4a0e..0b16f1f5200 100644 --- a/TAO/examples/Event_Comm/Makefile +++ b/TAO/examples/Event_Comm/Makefile @@ -65,16 +65,6 @@ endif # Naming #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -ifeq ($(ACE_HAS_GNUG_PRE_2_8),1) - - # Since older g++ cannot handle nested classes properly, this sample - # will not build on g++ prior to 2.8.0. - all clean realclean: - @echo Event_Comm 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 @@ -103,8 +93,6 @@ notifier: $(addprefix $(VDIR),$(NOTIFIER_OBJS)) realclean: clean -$(RM) Event_CommS.* Event_CommC.* Event_CommS_T.* -endif # ! ACE_HAS_GNUG_PRE_2_8 - #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile index 70dce788357..695b5471b2a 100644 --- a/TAO/examples/POA/TIE/Makefile +++ b/TAO/examples/POA/TIE/Makefile @@ -33,14 +33,6 @@ TAO_IDLFLAGS += -Ge 1 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -ifeq ($(ACE_HAS_GNUG_PRE_2_8),1) - - # Because older g++ cannot handle nested classes properly, this test - # will not build on g++ prior to 2.8.0. - all clean realclean: - @echo POA/TIE is not built with older versions of g++ - -else # ! ACE_HAS_GNUG_PRE_2_8 ifeq (cxvx,$(findstring cxvx,$(CXX))) # Green Hills for VxWorks can't build this test. It runs into @@ -48,7 +40,7 @@ ifeq (cxvx,$(findstring cxvx,$(CXX))) all clean realclean: @echo POA/TIE is not built with Green Hills $(CXX). -else # ! ACE_HAS_GNUG_PRE_2_8 && ! ghs/VxWorks +else # ! ghs/VxWorks ifeq (gcx,$(findstring gcx,$(CXX))) # Green Hills for Solaris can't build this test. It runs into @@ -56,7 +48,7 @@ ifeq (gcx,$(findstring gcx,$(CXX))) all clean realclean: @echo POA/TIE is not built with Green Hills $(CXX). -else # ! ACE_HAS_GNUG_PRE_2_8 && ! ghs +else # ! ghs/VxWorks && ! ghs/Solaris include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU @@ -86,7 +78,6 @@ realclean: clean endif # ! ghs/Solaris endif # ! ghs/VxWorks -endif # ! ACE_HAS_GNUG_PRE_2_8 #---------------------------------------------------------------------------- # Dependencies diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile index 02bf159a0bf..172479d322f 100644 --- a/TAO/examples/Quoter/Makefile +++ b/TAO/examples/Quoter/Makefile @@ -49,16 +49,6 @@ TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Ge 1 #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -ifeq ($(ACE_HAS_GNUG_PRE_2_8),1) - - # Since older g++ cannot handle nested classes properly, this test - # will not build on g++ prior to 2.8.0. - all clean realclean: - @echo examples/Quoter 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 @@ -101,8 +91,6 @@ Factory_Finder: $(addprefix $(VDIR),$(FACTORY_FINDER_OBJS)) Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) -endif # ! ACE_HAS_GNUG_PRE_2_8 - #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/examples/TypeCode_Creation/Makefile b/TAO/examples/TypeCode_Creation/Makefile index efce9848697..f395f5fe38e 100644 --- a/TAO/examples/TypeCode_Creation/Makefile +++ b/TAO/examples/TypeCode_Creation/Makefile @@ -32,9 +32,7 @@ include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU ifeq ($(minimum_corba),0) - ifneq ($(ACE_HAS_GNUG_PRE_2_8),1) - BIN=$(BIN_UNCHECKED) - endif # ACE_HAS_GNUG_PRE_2_8 + BIN=$(BIN_UNCHECKED) endif # minimum_corba include $(ACE_ROOT)/include/makeinclude/rules.common.GNU |