From ade129f2a0e9d3eea10aa2bd783b47e519ef9f3e Mon Sep 17 00:00:00 2001 From: bala Date: Sat, 13 Jul 2002 20:29:03 +0000 Subject: Fixed a wrong checkin --- TAO/tao/Utils/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/TAO/tao/Utils/Makefile b/TAO/tao/Utils/Makefile index 8fe7af65f9c..7e6c790be5b 100644 --- a/TAO/tao/Utils/Makefile +++ b/TAO/tao/Utils/Makefile @@ -8,9 +8,10 @@ ifndef TAO_ROOT endif # ! TAO_ROOT MAKEFILE = Makefile -LIBNAME_UNCHECKED = libTAO_Utils -SHLIB = $(LIBNAME).$(SHARED_EXT) -LIB = $(LIBNAME).a +LIBNAME = libTAO_Utils +LIB = $(LIBNAME).a +SHLIB = $(LIBNAME).$(SOEXT) + ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE CPP_SRCS += \ @@ -32,12 +33,8 @@ LSRC = $(addsuffix .cpp,$(FILES)) #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -ifeq ($(exceptions),1) -LIBNAME=$(LIBNAME_UNCHECKED) -SHARED_EXT=$(SOEXT) -endif # exceptions include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -- cgit v1.2.1