Ticket 37. if (schemaVersion > 1) - else if - else construction format

[stg.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index dbec16b86ff16e93294389f83e820496373ca870..72acdd62cdda79a0207c924fb19eb9dc616c7daf 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,13 +3,13 @@ INCS = -I . \
        -I ../stglibs/common.lib/include \
        -I ../stglibs/conffiles.lib/include \
        -I ../stglibs/logger.lib/include \
-       -I ../stglibs/locker.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)
+CXXFLAGS += $(CFLAGS)
 LIBS = -lpthread
 PROG = tests
 
@@ -20,13 +20,17 @@ SOURCES = main.cpp \
          test_conffiles.cpp \
          test_fee_charge_rules.cpp \
          test_reconnect_on_tariff_change.cpp \
+         test_crypto.cpp \
+         test_bfstream.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/scriptexecuter.lib/scriptexecuter.cpp \
+         ../stglibs/crypto.lib/bfstream.cpp \
+         ../stglibs/crypto.lib/blowfish.c
 
 .PHONY: all clean