Merge branch 'master' into full-month-stats

[stg.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 0635185c09e2dc4155887da33c679ff4a4d6f33c..ac6e4e10158433e2b0984b3674820566f38b8d3b 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS+=-g3 -Wall -W -Wextra -DLINUX -I../include -I../projects/stargazer -I../stglibs/stgconffiles.lib -I.
+CXXFLAGS+=-g3 -Wall -W -Wextra -DLINUX -I../include -I../projects/stargazer -I../stglibs/stgconffiles.lib -I. -DUSE_ABSTRACT_SETTINGS

 LIBS=-lpthread
 PROG=tests
 
 LIBS=-lpthread
 PROG=tests
 


@@ -7,11 +7,22 @@ SOURCES=main.cpp \
        test_admin_conf.cpp \
        test_tariff.cpp \
        test_conffiles.cpp \
        test_admin_conf.cpp \
        test_tariff.cpp \
        test_conffiles.cpp \

+       test_fee_charge_rules.cpp \
+       test_reconnect_on_tariff_change.cpp \

        ../projects/stargazer/tariff_impl.cpp \
        ../projects/stargazer/tariff_impl.cpp \

+       ../projects/stargazer/user_impl.cpp \
+       ../projects/stargazer/user_property.cpp \

        ../stglibs/conffiles.lib/conffiles.cpp \
        ../stglibs/conffiles.lib/conffiles.cpp \

-       ../stglibs/common.lib/common.cpp
+       ../stglibs/common.lib/common.cpp \
+       ../stglibs/logger.lib/logger.cpp \
+       ../stglibs/scriptexecuter.lib/scriptexecuter.cpp

 
 

-all: $(PROG) 
+.PHONY: all includes clean
+
+all: includes $(PROG)
+
+includes:
+       make -C ../stglibs includes

 
 $(PROG): $(subst .cpp,.o,$(SOURCES))
        $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
 
 $(PROG): $(subst .cpp,.o,$(SOURCES))
        $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@