-CXXFLAGS+=-g3 -Wall -W -Wextra -DLINUX -I../include -I../projects/stargazer -I../stglibs/stgconffiles.lib -I.
-LIBS=-lpthread
-PROG=tests
-
-SOURCES=main.cpp \
- test_raw_ip.cpp \
- test_admin_conf.cpp \
- test_tariff.cpp \
- test_conffiles.cpp \
- ../projects/stargazer/tariff_impl.cpp \
- ../stglibs/conffiles.lib/conffiles.cpp \
- ../stglibs/common.lib/common.cpp
-
-all: $(PROG)
-
-$(PROG): $(subst .cpp,.o,$(SOURCES))
+INCS = -I . \
+ -I ../include \
+ -I ../stglibs/common.lib/include \
+ -I ../stglibs/conffiles.lib/include \
+ -I ../stglibs/logger.lib/include \
+ -I ../stglibs/scriptexecuter.lib/include \
+ -I ../stglibs/crypto.lib/include \
+ -I ../projects/stargazer
+DEFS = -DLINUX \
+ -DUSE_ABSTRACT_SETTINGS
+CFLAGS += -g3 -Wall -W -Wextra $(INCS) $(DEFS)
+CXXFLAGS = $(CFLAGS)
+LIBS = -lpthread
+PROG = tests
+
+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 \
+ test_crypto.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 \
+ ../stglibs/crypto.lib/bfstream.cpp \
+ ../stglibs/crypto.lib/blowfish.c
+
+.PHONY: all clean
+
+all: $(PROG)
+
+$(PROG): $(addsuffix .o,$(basename $(SOURCES)))