Correction method GetPropertyValue

[stg.git] / stglibs / Makefile.in

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index b4344254ddc1dd3ddb72350005f17cbf796bc5a5..b5d1195c422ee9918c5a24eaa57244d5ca936d83 100644 (file)
--- a/stglibs/Makefile.in
+++ b/stglibs/Makefile.in
@@ -6,47 +6,42 @@ include ../../Makefile.conf
 
 PROG = lib$(LIB_NAME).a
 
+SEARCH_DIRS = -I ../../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)
-
-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)
+ifeq ($(DEBUG), yes)
+       install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
+else
+       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
+endif
        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)
@@ -65,7 +60,13 @@ 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 [ $$? -eq 0 ];\
+         then\
+           echo "`$(CC) $(CFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+           printf '%b\n' '\t$$(CC) $(CFLAGS) -c $$<' >> deps ;\
+         else\
+           echo "`$(CXX) $(CXXFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+           printf '%b\n' '\t$$(CXX) $(CXXFLAGS) -c $$<' >> deps ;\
+         fi;\
        done
-