WaitPackets moved to common.lib

[stg.git] / projects / rscriptd / Makefile

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 03e95fa713885e15530fa00a313f356a25697923..a009a5c1d9359af5a6ff868f0f69fbc2935ae76b 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -10,20 +10,14 @@ SRCS = ./main.cpp \
        ./listener.cpp \
        ./pidfile.cpp
 
        ./listener.cpp \
        ./pidfile.cpp
 

-STGLIBS =  -lstg_logger \
-           -lstg_common \
-          -lstg_crypto \
-           -lscript_executer \
-           -lconffiles
+STGLIBS =  -lstglogger \
+           -lstgcommon \
+          -lstgcrypto \
+           -lstgscriptexecuter \
+           -lstgconffiles

 
 LIBS += $(LIB_THREAD)
 
 
 LIBS += $(LIB_THREAD)
 

-#ifeq ($(OS),linux)
-#LIBS += -ldl
-#else
-#LIBS += -lc
-#endif
-

 SEARCH_DIRS = -I $(DIR_INCLUDE)
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 SEARCH_DIRS = -I $(DIR_INCLUDE)
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))


@@ -31,7 +25,7 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 

-vpath %.so $(DIR_LIB)
+vpath %.a $(DIR_LIB)

 
 .PHONY: all clean distclean libs install uninstall
 all: libs $(PROG) ../../Makefile.conf
 
 .PHONY: all clean distclean libs install uninstall
 all: libs $(PROG) ../../Makefile.conf


@@ -40,7 +34,7 @@ libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 $(PROG): $(OBJS) $(STGLIBS) 
        $(MAKE) -C $(DIR_LIBSRC)
 
 $(PROG): $(OBJS) $(STGLIBS) 

-       $(CC) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
+       $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)

 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS


@@ -56,13 +50,12 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
 install: install-bin install-data
 
 install-bin:

-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/sbin

        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:
        # Install etc
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:
        # Install etc

-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer

        install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/stargazer/rscriptd.conf
 
 uninstall: uninstall-bin uninstall-data
        install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/stargazer/rscriptd.conf
 
 uninstall: uninstall-bin uninstall-data