Code cleanup.

[stg.git] / projects / convertor / Makefile

diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
index 86acb408a26000fb298cd7655ef8028050150e6d..efacbb64f927c6edf9096ca0654a834b7c63a7c9 100644 (file)
--- a/projects/convertor/Makefile
+++ b/projects/convertor/Makefile
@@ -9,16 +9,16 @@ 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
@@ -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
-
-