Version bump

[stg.git] / stglibs / Makefile.in

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index d86cac3c250572373cfb45e2bc5ec1bd4333ae72..5bbc24e5bdfe2bf8d710dd06a0b862ab2841ce71 100644 (file)
--- a/stglibs/Makefile.in
+++ b/stglibs/Makefile.in
@@ -6,41 +6,33 @@ include ../../Makefile.conf
 
 PROG = lib$(LIB_NAME).a
 
 
 PROG = lib$(LIB_NAME).a
 

+SEARCH_DIRS = -I ../../include -I . -I ./include
+

 ifeq ($(STG_TIME), yes)
 DEFS += -DSTG_TIME
 endif
 
 ifeq ($(STG_TIME), yes)
 DEFS += -DSTG_TIME
 endif
 

-ifneq ($(ADD_DEFS),)
-DEFS += $(ADD_DEFS)
+ifneq ($(LIB_DEFS),)
+DEFS += $(LIB_DEFS)

 endif
 
 endif
 

-SEARCH_DIRS = -I $(DIR_INCLUDE) -I ./
+ifneq ($(LIB_INCS),)
+SEARCH_DIRS += $(LIB_INCS)
+endif

 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 
 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)
 
 
 all: $(PROG)
 

-$(PROG): $(OBJS) $(STGLIBS)
+$(PROG): $(OBJS)

        ar rc lib$(LIB_NAME).a $(OBJS)
        ranlib lib$(LIB_NAME).a
        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 *.*~ 
 
 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: $(PROG)
        mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg


@@ -64,12 +56,14 @@ endif
 
 deps:  $(SRCS) ../../Makefile.conf
        @>deps ;\
 
 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) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+           echo -e '\t$$(CC) $(CFLAGS) -c $$<' >> deps ;\
+         else\
+           echo "`$(CXX) $(CXXFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+           echo -e '\t$$(CXX) $(CXXFLAGS) -c $$<' >> deps ;\
+         fi;\
+       done