Obsolete files removed

[stg.git] / projects / stargazer / Makefile

diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
index 02757ad1e57cf9cf48ce2071726734705f9f7d65..5aa4687fb8b63cb2c96aaae2c707ad0cf8ece7c6 100644 (file)
--- a/projects/stargazer/Makefile
+++ b/projects/stargazer/Makefile
@@ -6,21 +6,21 @@ include ../../Makefile.conf
 
 PROG = stargazer
 
-SRCS = ./admin.cpp \
-       ./admins.cpp \
+SRCS = ./admin_impl.cpp \
+       ./admins_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 \
+       ./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 \
@@ -55,7 +55,7 @@ plugins: libs
        $(MAKE) -C $(DIR_PLUGINS)
 
 $(PROG): $(OBJS) libs
-       $(CC) $(OBJS) $(LDFLAGS) $(LIBS) $(STGLIBS) -o $(PROG)
+       $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) $(STGLIBS) -o $(PROG)
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS
@@ -73,22 +73,35 @@ distclean: clean
 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
        $(MAKE) -C $(DIR_PLUGINS) install
 
 install-data:
        # Install etc
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer
+       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 ../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 ../conf-available.d/mod_cap_ether.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_ether.conf
+else
+       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
@@ -129,12 +142,10 @@ endif
 endif
 endif
 
-deps:  $(SRCS) ../../Makefile.conf
+deps: $(SRCS) ../../Makefile.conf
        $(MAKE) -C $(DIR_LIBSRC) includes
        @>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 ;\
        done
-
-