X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9dbaa1f22054ff5492e793259d5641b876b57ac1..d7d8cffb85a42301bac662c4e2cd3f36ae50a66a:/projects/convertor/Makefile

diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
index 7fd02880..efacbb64 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
@@ -70,8 +70,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
-
-