Version bump

[stg.git] / projects / stargazer / Makefile

diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
index a0f2edca880a857f979c3c36c15717e8adfd857a..33027aaa62ab74cc6e8b88e799153b10617801c6 100644 (file)
--- a/projects/stargazer/Makefile
+++ b/projects/stargazer/Makefile
@@ -6,44 +6,48 @@ include ../../Makefile.conf
 
 PROG = stargazer
 
-SRCS = ./admin.cpp \
-       ./admins.cpp \
+SRCS = ./admin_impl.cpp \
+       ./admins_impl.cpp \
+       ./corps_impl.cpp \
+       ./eventloop.cpp \
        ./main.cpp \
-       ./settings.cpp \
-       ./stg_timer.cpp \
-       ./tariff.cpp \
-       ./tariffs.cpp \
-       ./traffcounter.cpp \
-       ./user.cpp \
-       ./user_property.cpp \
-       ./users.cpp \
+       ./pidfile.cpp \
        ./plugin_runner.cpp \
+       ./settings_impl.cpp \
+       ./services_impl.cpp \
+       ./stg_timer.cpp \
        ./store_loader.cpp \
-       ./pidfile.cpp \
-       ./eventloop.cpp
+       ./tariff_impl.cpp \
+       ./tariffs_impl.cpp \
+       ./traffcounter_impl.cpp \
+       ./user_impl.cpp \
+       ./user_property.cpp \
+       ./users_impl.cpp
 
-STGLIBS =  -lstg_logger \
-          -lstg_locker \
-           -lstg_common \
-           -lscript_executer \
-           -ldotconfpp
+STGLIBS = logger \
+         locker \
+          common \
+          scriptexecuter \
+          dotconfpp
 
-LIBS += -lexpat
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
+
+LIBS += -lexpat $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
 
 ifeq ($(OS),linux)
-LIBS += $(LIB_THREAD) \
-        -ldl
+LIBS += -ldl
 else
-LIBS += $(LIB_THREAD) \
-        -lc
+LIBS += -lc -liconv
 endif
 
-SEARCH_DIRS = -I $(DIR_INCLUDE)
+SEARCH_DIRS = -I ../../include
 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(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 install-bin install-data
 all: libs plugins $(PROG)
@@ -54,8 +58,8 @@ libs:
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 
-$(PROG): $(OBJS) libs
-       $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) $(STGLIBS) -o $(PROG)
+$(PROG): $(OBJS)
+       $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS
@@ -72,37 +76,37 @@ distclean: clean
 
 install: install-bin install-data
 
-install-bin:
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/sbin
+install-bin: $(PROG)
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+       $(MAKE) -C $(DIR_INCLUDE) install
        $(MAKE) -C $(DIR_LIBSRC) install
        $(MAKE) -C $(DIR_PLUGINS) install
 
 install-data:
        # Install etc
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer/conf-available.d
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer/conf-enabled.d
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-available.d
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-enabled.d
        install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/stargazer.conf $(PREFIX)/etc/stargazer/stargazer.conf
        install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/conf-available.d/*.conf $(PREFIX)/etc/stargazer/conf-available.d
-       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_ao.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ao.conf
-       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_ia.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ia.conf
-       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_ping.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ping.conf
-       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_sg.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_sg.conf
+       ln -s ../conf-available.d/mod_ao.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ao.conf
+       ln -s ../conf-available.d/mod_ia.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ia.conf
+       ln -s ../conf-available.d/mod_ping.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ping.conf
+       ln -s ../conf-available.d/mod_sg.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_sg.conf
 
 ifeq ($(OS),linux)
-       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_cap_ether.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_ether.conf
+       ln -s ../conf-available.d/mod_cap_ether.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_ether.conf
 else
-       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_cap_bpf.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_bpf.conf
+       ln -s ../conf-available.d/mod_cap_bpf.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_bpf.conf
 endif
 
        install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/rules $(PREFIX)/etc/stargazer/rules
        install -m $(BIN_MODE) -o $(OWNER) $(ETC_DIR)/On* $(PREFIX)/etc/stargazer/
        
        # Install file db
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/var/stargazer/admins
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/var/stargazer/tariffs
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/var/stargazer/users/test
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/admins
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/tariffs
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/users/test
        install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/admins/admin.adm $(PREFIX)/var/stargazer/admins/admin.adm
        install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/tariffs/tariff.tf $(PREFIX)/var/stargazer/tariffs/tariff.tf
        install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/conf $(PREFIX)/var/stargazer/users/test/conf
@@ -143,10 +147,10 @@ endif
 endif
 endif
 
-deps:  $(SRCS) ../../Makefile.conf
-       $(MAKE) -C $(DIR_LIBSRC) includes
+deps: $(SRCS) ../../Makefile.conf
+       $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
        for file in $(SRCS); do\
-         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
-         echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
+         echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
+         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\
        done