X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/48ca7f876fa5f45a34bfd2d63f1804e5cb5e6a2b..6fe1c267d914edfb7b0d677324a3b1883df1ed9f:/tests/Makefile?ds=inline

diff --git a/tests/Makefile b/tests/Makefile
index 56d7d95d..6c52d9ea 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,22 +1,35 @@
-CXXFLAGS+=-g3 -Wall -W -pedantic -DLINUX -I../include -I../projects/stargazer -I../stglibs/conffiles.lib
-LIBS=-lpthread
-PROG=tests
+CFLAGS += -g3 -Wall -W -Wextra -DLINUX -I../include -I../projects/stargazer -I../stglibs/stgconffiles.lib -I. -DUSE_ABSTRACT_SETTINGS -DLINUX
+CXXFLAGS = ${CFLAGS}
+LIBS = -lpthread
+PROG = tests
 
-SOURCES=main.cpp \
-	test_raw_ip.cpp \
-	test_admin_conf.cpp \
-	test_tariff.cpp \
-	test_conffiles.cpp \
-	../projects/stargazer/tariff.cpp \
-	../stglibs/conffiles.lib/conffiles.cpp
+SOURCES = main.cpp \
+	  test_raw_ip.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/user_impl.cpp \
+	  ../projects/stargazer/user_property.cpp \
+	  ../stglibs/conffiles.lib/conffiles.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 $@
 
 clean:
-	rm -f *.o *.d
+	rm -f *.o *.d $(PROG)
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)