Custom .gitignore for sgauth added

[stg.git] / projects / sgconf / Makefile

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index 6dbf21171f5569a63d0b066cf11d834309030739..0697b32996118dd8793ada7784f8cc409e704075 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -11,13 +11,13 @@ SRCS = ./main.cpp \
 
 STGLIBS = conffiles \
           srvconf \
 
 STGLIBS = conffiles \
           srvconf \

-          common \
-         crypto
+         crypto \
+          common

 
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
 
 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
 
 ifeq ($(OS),linux)
 else


@@ -88,7 +88,5 @@ deps: $(SRCS) ../../Makefile.conf
        @>deps ;\
        for file in $(SRCS); do\
          echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
        @>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
        done

-
-