X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..a93c3e6db369da26e9e54e96b23760fe521b0bfb:/stglibs/Makefile.in

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index 0c42dd51..e1084b7b 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,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) $(INCS) $(PREFIX)/usr/include/stg/
 
 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