Merge branch 'master' into full-month-stats

[stg.git] / projects / convertor / Makefile

diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
index 7fd028807ab210d16a010c884d442063b51224a8..4417e970133b3859a15f7063d5264401d320395f 100644 (file)
--- 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 '%b\n' '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\
        done
-
-