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

diff --git a/Makefile b/Makefile
index b7fc179..a22b766 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++
@@ -52,6 +52,8 @@ 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
@@ -97,12 +99,12 @@ install: build
 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:
@@ -124,9 +126,9 @@ bin/cassiopeia: libs ${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
 
-${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