X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=Makefile;h=cecbd4f2048c6295550344ce48e35de90f95e331;hb=9c55265516730ab819180848f2bd7a0fd27a3d79;hp=b7fc17955b179cf2fa33769502adc72027f42f1e;hpb=a477eeab986cf4307f74d1b4601cc46a7b0173c0;p=cassiopeia.git

diff --git a/Makefile b/Makefile
index b7fc179..cecbd4f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
 BIN="bin/cassiopeia"
-LIBS=openssl collissiondetect
+LIBS=openssl collisiondetect
 
 CC=libtool --mode=compile gcc
 CC_DEP=g++
@@ -24,7 +24,7 @@ CXX_DEP=g++
 LD=libtool --mode=link g++
 
 ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS+=-DNO_DAEMON -g
+CFLAGS+=-DNO_DAEMON -g -Og
 endif
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
     CFLAGS += -O0
@@ -32,7 +32,7 @@ else
     CFLAGS += -O2
 endif
 
-CFLAGS+=${ADDFLAGS} -Wall -Werror -Wextra -pedantic -std=c++11 -Ilib/openssl/include -Isrc
+CFLAGS+=${ADDFLAGS} -Wall -Werror -Wextra -pedantic -std=c++1y -Ilib/openssl/include -Isrc
 CXXFLAGS=$(CFLAGS)
 LDFLAGS+=${ADDFLAGS} -L/usr/lib/i386-linux-gnu/ -lssl -lcrypto -ldl -Llib/openssl
 
@@ -46,12 +46,14 @@ SRC_DIR=src
 OBJ_DIR=obj
 DEP_DIR=dep
 
-FS_SRC=$(wildcard ${SRC_DIR}/*.cpp) $(wildcard ${SRC_DIR}/io/*.cpp) $(wildcard ${SRC_DIR}/crypto/*.cpp) $(wildcard ${SRC_DIR}/db/*.cpp)
+FS_SRC=$(wildcard ${SRC_DIR}/*.cpp) $(wildcard ${SRC_DIR}/log/*.cpp) $(wildcard ${SRC_DIR}/io/*.cpp) $(wildcard ${SRC_DIR}/crypto/*.cpp) $(wildcard ${SRC_DIR}/db/*.cpp)
 
 FS_BIN=$(wildcard ${SRC_DIR}/app/*.cpp)
 FS_LIBS=$(wildcard lib/*/)
 FS_OBJ=$(FS_SRC:${SRC_DIR}/%.cpp=${OBJ_DIR}/%.lo)
 FS_DEP=$(FS_SRC:${SRC_DIR}/%.cpp=${DEP_DIR}/%.d)
+LIB_OPENSSL=lib/openssl/libssl.a
+
 
 .SUFFIXES: .c .cpp .d
 
@@ -79,7 +81,7 @@ endif
 .PHONY: dist-clean
 dist-clean: clean
 	${MAKE} -C lib/openssl clean
-	${MAKE} -C lib/collissiondetect clean
+	${MAKE} -C lib/collisiondetect clean
 
 
 build: cassiopeia
@@ -91,18 +93,18 @@ endif
 install: build
 	${INSTALL_PROGRAM} bin/cassiopeia ${DESTDIR}/usr/bin/cassiopeia
 	${INSTALL_PROGRAM} bin/cassiopeia-signer ${DESTDIR}/usr/bin/cassiopeia-signer
-	${INSTALL_DIR} ${DESTDIR}/etc/cacert/cassiopeia
+	${INSTALL_DIR} ${DESTDIR}/etc/wpia/cassiopeia
 
 .PHONY: libs
 libs: ${LIBS}
 
 .PHONY: openssl
-openssl:
+openssl lib/openssl/libssl.a lib/openssl/libcrypto.a:
 	${MAKE} -C lib openssl
 
-.PHONY: collissiondetect
-collissiondetect:
-	${MAKE} -C lib/collissiondetect
+.PHONY: collisiondetect
+collisiondetect:
+	${MAKE} -C lib collisiondetect
 
 .PHONY: coverage
 coverage:
@@ -114,19 +116,23 @@ coverage:
 	lcov -r coverage.info "/usr/**" -o coverage_stripped.info &&\
 	genhtml -p $(shell pwd) coverage_stripped.info --output-directory coverage
 
+.PHONY: checkformat
+checkformat:
+	(! LC_ALL=C scripts/format.sh | grep -q "^Formatted  ")
+
 # --------
 
 cassiopeia: bin/cassiopeia bin/cassiopeia-signer
 
 bin/cassiopeia: libs ${FS_OBJ} ${OBJ_DIR}/apps/client.lo
-	${MKDIR} $(shell dirname $@) &&  ${LD} ${LDFLAGS} -lmysqlclient -o $@ ${FS_OBJ} ${OBJ_DIR}/apps/client.lo
+	${MKDIR} $(shell dirname $@) &&  ${LD} ${LDFLAGS} -lpqxx -lpq -o $@ ${FS_OBJ} ${OBJ_DIR}/apps/client.lo
 
 bin/cassiopeia-signer: libs ${FS_OBJ} ${OBJ_DIR}/apps/signer.lo
-	${MKDIR} $(shell dirname $@) &&  ${LD} ${LDFLAGS} -o $@ $(filter-out ${OBJ_DIR}/db/mysql.lo,${FS_OBJ}) ${OBJ_DIR}/apps/signer.lo
+	${MKDIR} $(shell dirname $@) &&  ${LD} ${LDFLAGS} -o $@ $(filter-out  ${OBJ_DIR}/db/psql.lo, $(filter-out ${OBJ_DIR}/db/mysql.lo,${FS_OBJ})) ${OBJ_DIR}/apps/signer.lo
 
-${DEP_DIR}/%.d: ${SRC_DIR}/%.cpp
+${DEP_DIR}/%.d: ${SRC_DIR}/%.cpp ${LIB_OPENSSL}
 	${MKDIR} $(shell dirname $@) && $(CXX_DEP) $(CXXFLAGS) -M -MF $@ $<
-${DEP_DIR}/%.d: ${SRC_DIR}/%.c
+${DEP_DIR}/%.d: ${SRC_DIR}/%.c ${LIB_OPENSSL}
 	${MKDIR} $(shell dirname $@) && $(CC) $(CXXFLAGS) -M -MF $@ $<
 
 ${OBJ_DIR}/%.lo ${OBJ_DIR}/%.o: ${SRC_DIR}/%.c ${DEP_DIR}/%.d