Merge branch 'master' into full-month-stats

[stg.git] / projects / rscriptd / Makefile

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index a009a5c1d9359af5a6ff868f0f69fbc2935ae76b..581b3275acc52d9d874186497dc5b6717b3e9c7e 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -10,22 +10,29 @@ SRCS = ./main.cpp \
        ./listener.cpp \
        ./pidfile.cpp
 
-STGLIBS =  -lstglogger \
-           -lstgcommon \
-          -lstgcrypto \
-           -lstgscriptexecuter \
-           -lstgconffiles
+STGLIBS = scriptexecuter \
+          conffiles \
+         logger \
+         locker \
+         crypto \
+          common
 
-LIBS += $(LIB_THREAD)
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-SEARCH_DIRS = -I $(DIR_INCLUDE)
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
 
-OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
+ifneq ($(OS),linux)
+LIBS += -liconv
+endif
 
-CXXFLAGS += -Wall
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
+SEARCH_DIRS = -I ../../include
+
+OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
-vpath %.a $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)
 
 .PHONY: all clean distclean libs install uninstall
 all: libs $(PROG) ../../Makefile.conf
@@ -33,7 +40,7 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
-$(PROG): $(OBJS) $(STGLIBS) 
+$(PROG): $(OBJS)
        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
@@ -77,11 +84,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
-
-