Merge branch 'master' into full-month-stats

[stg.git] / projects / convertor / Makefile

diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
index c07f698efec322ae0a34cdb880321bccf85ec35e..4417e970133b3859a15f7063d5264401d320395f 100644 (file)
--- a/projects/convertor/Makefile
+++ b/projects/convertor/Makefile
@@ -7,29 +7,32 @@ include ../../Makefile.conf
 PROG = convertor
 
 SRCS = ./main.cpp \
-       ./settings.cpp
+       ./settings_impl.cpp
 
-STGLIBS =  -lstg_logger \
-           -lstg_common \
-           -ldotconfpp \
-          -lstg_crypto
+STGLIBS = dotconfpp \
+         conffiles \
+         logger \
+         crypto \
+          common
 
-LIBS += $(LIB_THREAD)
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
+
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
-LIBS += -lc
+LIBS += -lc -liconv
 endif
 
-SEARCH_DIRS = -I $(DIR_INCLUDE)
+SEARCH_DIRS = -I ../../include
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
-CXXFLAGS += -Wall
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(DIR_LIB)
-
-vpath %.so $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)
 
 .PHONY: all clean distclean libs plugins install uninstall
 all: libs plugins $(PROG) ../../Makefile.conf
@@ -40,8 +43,8 @@ libs:
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 
-$(PROG): $(OBJS) $(STGLIBS) 
-       $(CC) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
+$(PROG): $(OBJS)
+       $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS
@@ -64,11 +67,9 @@ endif
 endif
 
 deps:  $(SRCS) ../../Makefile.conf
-       $(MAKE) -C $(DIR_LIBSRC) includes
+       $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
        for file in $(SRCS); do\
-         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile" >> deps ;\
-         echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
+         echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+         printf '%b\n' '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\
        done
-
-