g++ при компоновке заменен на $(CXX)

DEFS добавлены к CXXFLAGS
Убрана неиспользуемая ADD_CXXFLAGS_1
ADD_DEFS_1 заменен на ADD_DEFS

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index 0c42dd51a6ef44bbc222fe5f200271a1f0919a6a..c6db5f999c9b26f4ae5ba73a03de1cda599eee17 100644 (file)
--- a/stglibs/Makefile.in
+++ b/stglibs/Makefile.in
@@ -32,8 +32,8 @@ ifeq ($(STG_TIME), yes)
 DEFS += -DSTG_TIME
 endif
 
 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 ./
 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)
 
 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
 
 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)
 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)
        ar rc lib$(LIB_NAME).a $(OBJS)
        ranlib lib$(LIB_NAME).a
        cp *.so $(DIR_LIB)