X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/703ad5b9a14dc2a42849669d3618a8ba1136bb92..71d677c9c98e3d2dbdffba72b3b351365f328529:/stglibs/Makefile.in?ds=sidebyside

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index c0b4f2b9..a3184974 100644
--- a/stglibs/Makefile.in
+++ b/stglibs/Makefile.in
@@ -6,7 +6,7 @@ include ../../Makefile.conf
 
 PROG = lib$(LIB_NAME).a
 
-SEARCH_DIRS = -I $(DIR_INCLUDE) -I . -I ./include
+SEARCH_DIRS = -I ../../include -I . -I ./include
 
 ifeq ($(STG_TIME), yes)
 DEFS += -DSTG_TIME
@@ -22,35 +22,23 @@ endif
 
 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
-CFLAGS += -fPIC
-
-vpath %.a $(DIR_LIB)
+CXXFLAGS += -fPIC $(SEARCH_DIRS) $(DEFS)
+CFLAGS += -fPIC $(SEARCH_DIRS) $(DEFS)
 
 all: $(PROG)
 
-$(PROG): $(OBJS) $(STGLIBS)
+$(PROG): $(OBJS)
 	ar rc lib$(LIB_NAME).a $(OBJS)
 	ranlib lib$(LIB_NAME).a
-	#cp *.a $(DIR_LIB)
-
-#includes: $(INCS)
-#	cp -p $(INCS) $(DIR_INCLUDE)/stg
 
 clean:
 	rm -f deps $(PROG) *.o *.a *.so tags *.*~ 
-	#for file in $(INCS); do \
-	#    rm -f $(DIR_INCLUDE)/stg/$$file; \
-	#done
 
 install: $(PROG)
 	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/
+	install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/
 
 uninstall:
 	rm -f $(PREFIX)/usr/lib/stg/$(PROG)
@@ -70,13 +58,12 @@ deps:	$(SRCS) ../../Makefile.conf
 	@>deps ;\
 	for file in $(SRCS); do\
 	  echo "$$file" | grep ".c$$" > /dev/null;\
-	  if [ $$? == 0 ];\
+	  if [ $$? -eq 0 ];\
 	  then\
-	    echo "`$(CC) $(CFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
-	    echo -e '\t$$(CC) $(CFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\
+	    echo "`$(CC) $(CFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+	    printf '%b\n' '\t$$(CC) $(CFLAGS) -c $$<' >> deps ;\
 	  else\
-	    echo "`$(CXX) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
-	    echo -e '\t$$(CXX) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\
+	    echo "`$(CXX) $(CXXFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+	    printf '%b\n' '\t$$(CXX) $(CXXFLAGS) -c $$<' >> deps ;\
 	  fi;\
 	done
-