X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9dbaa1f22054ff5492e793259d5641b876b57ac1..67ec26f3863f75d0d246c343db6d7ec671cb2a42:/projects/sgconf_xml/Makefile?ds=inline diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile index 671833ed..b953bb52 100644 --- a/projects/sgconf_xml/Makefile +++ b/projects/sgconf_xml/Makefile @@ -17,7 +17,7 @@ STGLIBS = conffiles \ STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS))) STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS))) -LIBS += -lexpat $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS)) +LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD) ifeq ($(OS),linux) else @@ -66,7 +66,11 @@ distclean: clean install: install-bin install-data install-bin: - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) +endif $(MAKE) -C $(DIR_LIBSRC) install uninstall: uninstall-bin uninstall-data @@ -87,8 +91,13 @@ deps: $(SRCS) ../../Makefile.conf $(MAKE) -C $(DIR_LIBSRC) @>deps ;\ for file in $(SRCS); do\ - echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\ - echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\ + echo "$$file" | grep ".c$$" > /dev/null;\ + if [ $$? -eq 0 ];\ + then\ + echo "`$(CC) $(CFLAGS) -MM $$file` Makefile" >> deps ;\ + printf '%b\n' '\t$$(CC) $(CFLAGS) -c $$<' >> deps ;\ + else\ + echo "`$(CXX) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\ + printf '%b\n' '\t$$(CXX) $(CXXFLAGS) -c $$<' >> deps ;\ + fi;\ done - -