X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=test%2FMakefile;h=756e9a24305e7e8cbc0b6576c49d10e71bb74b6c;hb=dc63575cbbef92d3ee7f0f6c22dae7e42f579651;hp=68e794e055359465bab2a409e5fdb54bd8690bea;hpb=28e331e99235c616e8ccd27b7b5083bae47a1c1b;p=cassiopeia.git diff --git a/test/Makefile b/test/Makefile index 68e794e..756e9a2 100644 --- a/test/Makefile +++ b/test/Makefile @@ -7,7 +7,7 @@ else endif BIN="bin/cassiopeia-test" -LIBS=openssl collissiondetect +LIBS=openssl collisiondetect CC=libtool --mode=compile gcc CC_DEP=g++ @@ -16,12 +16,12 @@ CXX_DEP=g++ LD=libtool --mode=link g++ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) -CFLAGS+=-DNO_DAEMON -g +CFLAGS+=-DNO_DAEMON -g -Og endif CFLAGS+=${ADDFLAGS} -Wall -Werror -Wextra -pedantic -std=c++11 -I../src -I../lib/openssl/include CXXFLAGS=$(CFLAGS) -LDFLAGS+=${ADDFLAGS} -lmysqlclient -lssl -lcrypto -ldl -lboost_unit_test_framework -L../lib/openssl -L/usr/lib/i386-linux-gnu +LDFLAGS+=${ADDFLAGS} -lssl -lcrypto -ldl -lboost_unit_test_framework -L../lib/openssl -L/usr/lib/i386-linux-gnu -lpqxx -lpq ifneq (,$(filter coverage,$(DEB_BUILD_OPTIONS))) LDFLAGS += -lgcov @@ -63,7 +63,7 @@ testdata: ./genTestData.sh build: cassiopeia-test testdata - ${BIN} + ${BIN} --log_level=warning .PHONY: install install: build @@ -75,9 +75,9 @@ libs: ${LIBS} openssl: ${MAKE} -C ../lib openssl -.PHONY: collissiondetect -collissiondetect: - ${MAKE} -C ../lib/collissiondetect +.PHONY: collisiondetect +collisiondetect: + ${MAKE} -C ../lib/collisiondetect # --------