X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=test%2FMakefile;h=803ba65a337e19c9804a668017dfdf360340f4cb;hb=f06c8dee90dbb6ccf031af872efb2cdd8d3d3b8a;hp=a765a9a333d3888b2d566199c74d2e97daefd9b0;hpb=7a72391242e316a16992e0874a118999486afb87;p=cassiopeia.git

diff --git a/test/Makefile b/test/Makefile
index a765a9a..803ba65 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,29 +9,24 @@ endif
 BIN="bin/cassiopeia-test"
 LIBS=openssl collissiondetect
 
-LT_CC=libtool --mode=compile gcc
-LT_CC_DEP=g++
-LT_CXX=libtool --mode=compile g++
-LT_CXX_DEP=g++
-LT_LD=libtool --mode=link g++
-
-CC=${LT_CC}
-CC_DEP=${LT_CC_DEP}
-CXX=${LT_CXX}
-CXX_DEP=${LT_CXX_DEP}
-LD=${LT_LD}
+CC=libtool --mode=compile gcc
+CC_DEP=g++
+CXX=libtool --mode=compile g++
+CXX_DEP=g++
+LD=libtool --mode=link g++
 
 ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-ADDFLAGS=-DNO_DAEMON
+CFLAGS+=-DNO_DAEMON -g
 endif
 
-CFLAGS=-O3 -g -flto -Wall -Werror -Wextra -pedantic -std=c++11 ${ADDFLAGS}
+CFLAGS+=${ADDFLAGS} -Wall -Werror -Wextra -pedantic -std=c++11 -I../src -I../lib/openssl/include
 CXXFLAGS=$(CFLAGS)
-LDFLAGS=-O3 -g -flto -lmysqlclient -lssl -lcrypto -ldl -lboost_unit_test_framework
+LDFLAGS+=${ADDFLAGS} -lmysqlclient -lssl -lcrypto -ldl -lboost_unit_test_framework -L../lib/openssl -L/usr/lib/i386-linux-gnu
 
 SRC_DIR=src
 OBJ_DIR=obj
 DEP_DIR=dep
+TESTDATA_DIR=testdata
 
 FS_SRC=$(wildcard ${SRC_DIR}/*.cpp)
 FS_BIN=$(wildcard ${SRC_DIR}/app/*.cpp)
@@ -55,8 +50,13 @@ clean::
 	-rm -rf *.so
 	-rm -rf ${OBJ_DIR}
 	-rm -rf ${DEP_DIR}
+	-rm -rf ${TESTDATA_DIR}
 
-build: cassiopeia-test
+.PHONY: testdata
+testdata:
+	./genTestData.sh
+
+build: cassiopeia-test testdata
 	${BIN}
 
 .PHONY: install
@@ -67,7 +67,7 @@ libs: ${LIBS}
 
 .PHONY: openssl
 openssl:
-	${MAKE} -C ../lib/openssl
+	${MAKE} -C ../lib openssl
 
 .PHONY: collissiondetect
 collissiondetect:
@@ -78,7 +78,7 @@ collissiondetect:
 cassiopeia-test: bin/cassiopeia-test
 
 bin/cassiopeia-test: libs ${FS_OBJ}
-	${MKDIR} $(shell dirname $@) && ${LT_LD} ${LDFLAGS} -o $@ ${FS_OBJ}
+	${MKDIR} $(shell dirname $@) && ${LD} ${LDFLAGS} -o $@ ${FS_OBJ} $(filter-out %/main.o,$(wildcard ../obj/*.o))
 
 ${DEP_DIR}/%.d: ${SRC_DIR}/%.cpp
 	${MKDIR} $(shell dirname $@) && $(CXX_DEP) $(CXXFLAGS) -M -MF $@ $<