X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/03e7dd38e43d467d835fe48ee5bea5acbb37f08d..703ad5b9a14dc2a42849669d3618a8ba1136bb92:/stglibs/Makefile.in diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in index d86cac3c..c0b4f2b9 100644 --- a/stglibs/Makefile.in +++ b/stglibs/Makefile.in @@ -6,20 +6,24 @@ include ../../Makefile.conf PROG = lib$(LIB_NAME).a +SEARCH_DIRS = -I $(DIR_INCLUDE) -I . -I ./include + ifeq ($(STG_TIME), yes) DEFS += -DSTG_TIME endif -ifneq ($(ADD_DEFS),) -DEFS += $(ADD_DEFS) +ifneq ($(LIB_DEFS),) +DEFS += $(LIB_DEFS) endif -SEARCH_DIRS = -I $(DIR_INCLUDE) -I ./ +ifneq ($(LIB_INCS),) +SEARCH_DIRS += $(LIB_INCS) +endif 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 CFLAGS += -fPIC @@ -31,16 +35,16 @@ all: $(PROG) $(PROG): $(OBJS) $(STGLIBS) ar rc lib$(LIB_NAME).a $(OBJS) ranlib lib$(LIB_NAME).a - cp *.a $(DIR_LIB) + #cp *.a $(DIR_LIB) -includes: $(INCS) - cp -p $(INCS) $(DIR_INCLUDE)/stg +#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 + #for file in $(INCS); do \ + # rm -f $(DIR_INCLUDE)/stg/$$file; \ + #done install: $(PROG) mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg @@ -64,12 +68,15 @@ endif deps: $(SRCS) ../../Makefile.conf @>deps ;\ - for file in `echo "$(SRCS)" | grep ".c$$"`; do\ - echo "`$(CC) $(CFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\ - echo -e '\t$$(CC) $(CFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\ - done;\ - for file in `echo "$(SRCS)" | grep ".cpp$$"`; do\ - echo "`$(CXX) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\ - echo -e '\t$$(CXX) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\ - done\ + for file in $(SRCS); do\ + echo "$$file" | grep ".c$$" > /dev/null;\ + if [ $$? == 0 ];\ + then\ + echo "`$(CC) $(CFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\ + echo -e '\t$$(CC) $(CFLAGS) $(SEARCH_DIRS) $(DEFS) -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 ;\ + fi;\ + done