X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/08dcd5a57eb047269d56884bd325409e626e4c7f..9d7269d8d8333fc1ff47bedcaf488142570b1258:/projects/stargazer/Makefile diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile index 2b3bf3fb..1b109fef 100644 --- a/projects/stargazer/Makefile +++ b/projects/stargazer/Makefile @@ -6,44 +6,52 @@ 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 = scriptexecuter \ + dotconfpp \ + logger \ + common -LIBS += -lexpat +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 += $(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) + +ifneq ($(OS),darwin) +LDFLAGS += -Wl,-E $(STGLIBS_LIBS) +endif + +LDFLAGS += $(STGLIBS_LIBS) .PHONY: all clean distclean libs plugins install uninstall install-bin install-data all: libs plugins $(PROG) @@ -54,8 +62,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,8 +80,13 @@ distclean: clean install: install-bin install-data -install-bin: - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +install-bin: $(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +endif + $(MAKE) -C $(DIR_INCLUDE) install $(MAKE) -C $(DIR_LIBSRC) install $(MAKE) -C $(DIR_PLUGINS) install @@ -84,15 +97,16 @@ install-data: 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 + ln -sf ../conf-available.d/mod_ao.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ao.conf + ln -sf ../conf-available.d/mod_ia.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ia.conf + ln -sf ../conf-available.d/mod_ping.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ping.conf + ln -sf ../conf-available.d/mod_sg.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_sg.conf + ln -sf ../conf-available.d/store_files.conf $(PREFIX)/etc/stargazer/conf-enabled.d/store_files.conf ifeq ($(OS),linux) - ln -s ../conf-available.d/mod_cap_ether.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_ether.conf + ln -sf ../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 + ln -sf ../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 @@ -106,19 +120,6 @@ endif 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 install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/stat $(PREFIX)/var/stargazer/users/test/stat - -ifeq ($(CHECK_FBCLIENT),yes) - # Install firebird db - mkdir -p $(PREFIX)/var/stargazer - chown $(OWNER):$(FIREBIRD_GROUP) $(PREFIX)/var/stargazer - chmod g+rw $(PREFIX)/var/stargazer - echo "connect '$(DB_ADDRESS)' user '$(DB_USER)' password '$(DB_PASSWORD)';" > .db.sql - echo "drop database;" >> .db.sql - echo "create database '$(DB_ADDRESS)' user '$(DB_USER)' password '$(DB_PASSWORD)' default character set win1251;" >> .db.sql - cat $(VAR_DIR)/../00-base-00.sql >> .db.sql - $(FIREBIRD_ISQL) -i .db.sql - rm -f .db.sql -endif uninstall: uninstall-bin uninstall-data @@ -142,10 +143,17 @@ 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 "$$file" | grep ".c$$" > /dev/null;\ + if [ $$? -eq 0 ];\ + then\ + echo "`$(CC) $(CFLAGS) -MM $$file` Makefile" >> deps ;\ + printf '%b\n' '\t$$(CC) $(CFLAGS) -c $$<' >> deps ;\ + else\ + echo "`$(CXX) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\ + printf '%b\n' '\t$$(CXX) $(CXXFLAGS) -c $$<' >> deps ;\ + fi;\ done