-MG removed from deps generation in stglibs

[stg.git] / stglibs / Makefile.in

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index 0c42dd51a6ef44bbc222fe5f200271a1f0919a6a..a0c854e6ec105ddbcddacacd6c1c5828f53e4c29 100644 (file)
--- 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,39 +43,40 @@ 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)
        cp *.a $(DIR_LIB)
 
 includes: $(INCS)
-       cp -p $(INCS) $(DIR_INCLUDE)
+       cp -p $(INCS) $(DIR_INCLUDE)/stg
 
 clean:
        rm -f deps $(PROG) *.o *.a *.so tags *.*~ 
        for file in $(INCS); do \
-           rm -f $(DIR_INCLUDE)/$$file; \
+           rm -f $(DIR_INCLUDE)/stg/$$file; \
        done
 
 install: $(PROG)
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/lib/stg
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg
+       install -m $(DATA_MODE) -o $(OWNER) -t $(PREFIX)/usr/include/stg/ $(INCS)
 
 uninstall:
        rm -f $(PREFIX)/usr/lib/stg/$(PROG)
+       for file in $(INCS); do \
+           rm -f $(PREFIX)/usr/include/stg/$$file; \
+       done
 
 ifneq ($(MAKECMDGOALS),includes)
 ifneq ($(MAKECMDGOALS),clean)
@@ -88,7 +89,7 @@ endif
 deps:  $(SRCS) ../../Makefile.conf
        @>deps ;\
        for file in $(SRCS); do\
-         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -MM -MG $$file` Makefile ../../Makefile.conf" >> deps ;\
+         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
          echo -e '\t$$(CC) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\
        done