X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9dbaa1f22054ff5492e793259d5641b876b57ac1..af1b39c8dba29d0601b540b1892bb22bbe00de0d:/projects/convertor/Makefile?ds=inline diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile index 7fd02880..c1d9ff86 100644 --- a/projects/convertor/Makefile +++ b/projects/convertor/Makefile @@ -9,21 +9,21 @@ PROG = convertor SRCS = ./main.cpp \ ./settings_impl.cpp -STGLIBS = logger \ - common \ - dotconfpp \ - crypto \ - conffiles +STGLIBS = dotconfpp \ + conffiles \ + logger \ + crypto \ + common STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS))) STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS))) -LIBS += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS)) +LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) ifeq ($(OS),linux) LIBS += -ldl else -LIBS += -lc +LIBS += -lc -liconv endif SEARCH_DIRS = -I ../../include @@ -71,7 +71,5 @@ deps: $(SRCS) ../../Makefile.conf @>deps ;\ for file in $(SRCS); do\ echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\ - echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\ + printf '\t$$(CC) -c $$< $(CXXFLAGS)\n' >> deps ;\ done - -