Hide or add proper copy ctor and assignement operator, initialize

[stg.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 56d7d95d2a613ca0d0f19eadb3e7c6a48b080aea..6c52d9ea96e8b2d9dd7a6a6f327e5db19d22a908 100644 (file)
--- 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)