From c8c3c534f5e3b243ba524d8b24a60b0dad238dee Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Mon, 22 Nov 2010 17:34:03 +0200 Subject: [PATCH 1/1] =?utf8?q?g++=20=D0=BF=D1=80=D0=B8=20=D0=BA=D0=BE?= =?utf8?q?=D0=BC=D0=BF=D0=BE=D0=BD=D0=BE=D0=B2=D0=BA=D0=B5=20=D0=B7=D0=B0?= =?utf8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20=D0=BD=D0=B0=20$(CXX)=20DEFS=20?= =?utf8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BA?= =?utf8?q?=20CXXFLAGS=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D0=B0=20=D0=BD?= =?utf8?q?=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5?= =?utf8?q?=D0=BC=D0=B0=D1=8F=20ADD=5FCXXFLAGS=5F1=20ADD=5FDEFS=5F1=20?= =?utf8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20=D0=BD=D0=B0=20ADD?= =?utf8?q?=5FDEFS?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- stglibs/Makefile.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in index 0c42dd51..c6db5f99 100644 --- a/stglibs/Makefile.in +++ b/stglibs/Makefile.in @@ -32,8 +32,8 @@ ifeq ($(STG_TIME), yes) DEFS += -DSTG_TIME endif -ifneq ($(ADD_DEFS_1),) -DEFS += $(ADD_DEFS_1) +ifneq ($(ADD_DEFS),) +DEFS += $(ADD_DEFS) endif SEARCH_DIRS = -I $(DIR_INCLUDE) -I ./ @@ -43,19 +43,15 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS)))) INST_INCS = $(addprefix $(DIR_INCLUDE)/, $(notdir $(INCS))) INST_LIBS = $(DIR_LIB)/lib$(LIB_NAME) -CXXFLAGS += -fPIC +CXXFLAGS += -fPIC $(DEFS) LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg -ifneq ($(ADD_CXXFLAGS_1),) -CXXFLAGS += $(ADD_CXXFLAGS_1) -endif - vpath %.so $(DIR_LIB) all: $(PROG) $(PROG): $(OBJS) $(STGLIBS) - g++ $(LDFLAGS) -Wl,-soname,$(PROG) $^ $(LIBS) -o $(PROG) -L $(DIR_LIB) + $(CXX) $(LDFLAGS) -Wl,-soname,$(PROG) $^ $(LIBS) -o $(PROG) -L $(DIR_LIB) ar rc lib$(LIB_NAME).a $(OBJS) ranlib lib$(LIB_NAME).a cp *.so $(DIR_LIB) -- 2.44.2