X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/b72fc5808ad56022379f0da8ed741228024cd8df..2ab46b57b6d575e31dbfa48a77cd7308c01f5914:/tests/Makefile?ds=inline

diff --git a/tests/Makefile b/tests/Makefile
index 43643cac..72acdd62 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,41 +1,59 @@
-CXXFLAGS+=-g3 -Wall -W -Wextra -DLINUX -I../include -I../projects/stargazer -I../stglibs/stgconffiles.lib -I. -DUSE_ABSTRACT_SETTINGS
-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 \
-	../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
-
-.PHONY: all includes clean
-
-all: includes $(PROG)
-
-includes:
-	make -C ../stglibs includes
-
-$(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 \
+	  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/crypto.lib/bfstream.cpp \
+	  ../stglibs/crypto.lib/blowfish.c
+
+.PHONY: all clean
+
+all: $(PROG)
+
+$(PROG): $(addsuffix .o,$(basename $(SOURCES)))
 	$(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
 
 clean:
-	rm -f *.o *.d $(PROG)
+	rm -f $(addsuffix .o,$(basename $(SOURCES))) $(addsuffix .d,$(SOURCES)) $(PROG)
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)
--include $(subst .cpp,.d,$(SOURCES))
+-include $(addsuffix .d,$(SOURCES))
 endif
 endif
 
-%.d: %.cpp
-	@$(CC) -MM $(CXXFLAGS) $< > $@.$$$$; \
+%.cpp.d: %.cpp
+	@$(CXX) -MM $(CXXFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\).o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+%.c.d: %.c
+	@$(CC) -MM $(CFLAGS) $< > $@.$$$$; \
 	sed 's,\($*\).o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$