X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a93c3e6db369da26e9e54e96b23760fe521b0bfb..3b856e83ad55125111fe5961d07d7524bd6ee283:/stglibs/Makefile.in diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in index e1084b7b..a016fed5 100644 --- a/stglibs/Makefile.in +++ b/stglibs/Makefile.in @@ -4,29 +4,7 @@ include ../../Makefile.conf -PROG = lib$(LIB_NAME).so - -ifeq ($(PROT), on) -DEFS += -DLINPROT -endif - -ifeq ($(DEMO), on) -DEFS += -DDEMO -endif - -ifeq ($(OS), bsd) - ifeq ($(PROT), on) - DEFS += -DFREEBDSPROT - endif -MAKE = gmake -endif - -ifeq ($(OS), bsd5) - ifeq ($(PROT), on) - DEFS += -DFREEBDSPROT - endif -MAKE = gmake -endif +PROG = lib$(LIB_NAME).a ifeq ($(STG_TIME), yes) DEFS += -DSTG_TIME @@ -43,18 +21,16 @@ 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 $(DEFS) -LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg +CXXFLAGS += -fPIC +CFLAGS += -fPIC -vpath %.so $(DIR_LIB) +vpath %.a $(DIR_LIB) all: $(PROG) $(PROG): $(OBJS) $(STGLIBS) - $(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) @@ -89,7 +65,14 @@ endif deps: $(SRCS) ../../Makefile.conf @>deps ;\ for file in $(SRCS); do\ - echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\ - echo -e '\t$$(CC) $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS) -c $$<' >> deps ;\ + 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