Help book chapter 1 complete

[stg.git] / projects / stargazer / Makefile

diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
index 2b3bf3fb4dbb21a7de996b6e28c8bed53e26f64d..36739cc6917b7f242f1f4112005028e1914e0c9f 100644 (file)
--- a/projects/stargazer/Makefile
+++ b/projects/stargazer/Makefile
@@ -6,26 +6,26 @@ include ../../Makefile.conf
 
 PROG = stargazer
 
 
 PROG = stargazer
 

-SRCS = ./admin.cpp \
-       ./admins.cpp \
+SRCS = ./admin_impl.cpp \
+       ./admins_impl.cpp \
+       ./eventloop.cpp \

        ./main.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 \
        ./plugin_runner.cpp \

+       ./settings_impl.cpp \
+       ./stg_timer.cpp \

        ./store_loader.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 \
+STGLIBS =  -lstglogger \
+          -lstglocker \
+           -lstgcommon \
+           -lstgscriptexecuter \

            -ldotconfpp
 
 LIBS += -lexpat
            -ldotconfpp
 
 LIBS += -lexpat


@@ -72,8 +72,9 @@ distclean: clean
 
 install: install-bin install-data
 
 
 install: install-bin install-data
 

-install-bin:
+install-bin: $(PROG)

        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(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
 
        $(MAKE) -C $(DIR_LIBSRC) install
        $(MAKE) -C $(DIR_PLUGINS) install
 


@@ -142,7 +143,7 @@ endif
 endif
 endif
 
 endif
 endif
 

-deps:  $(SRCS) ../../Makefile.conf
+deps: $(SRCS) ../../Makefile.conf

        $(MAKE) -C $(DIR_LIBSRC) includes
        @>deps ;\
        for file in $(SRCS); do\
        $(MAKE) -C $(DIR_LIBSRC) includes
        @>deps ;\
        for file in $(SRCS); do\