From: Felix Dörre Date: Thu, 12 Mar 2015 18:18:32 +0000 (+0100) Subject: Fix: typo, it's collision X-Git-Url: https://code.wpia.club/?p=cassiopeia.git;a=commitdiff_plain;h=2a1bbaccc344c1d1a2e369464f8d18897339b8e1 Fix: typo, it's collision --- diff --git a/Makefile b/Makefile index c22fe86..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++ @@ -81,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 @@ -102,9 +102,9 @@ libs: ${LIBS} 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: diff --git a/lib/Makefile b/lib/Makefile index f96e780..880f2bb 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,8 +1,16 @@ LIB_SSL=openssl LIB_SSL_FILES= $(shell find ${LIB_SSL} -name "*.c") +LIB_COLL_FILES= $(shell find collisiondetect -name "*.c") + openssl: openssl/libcrypto.a +collisiondetect: collisiondetect/libdetectcoll.la + +collisiondetect/libdetectcoll.la: ${LIB_COLL_FILES} +# make -C collisiondetect +# echo $^ + openssl/libcrypto.a: ${LIB_SSL_FILES} cd ${LIB_SSL} && ( [ -f Makefile ] || ./config -DPURIFY ) ${MAKE} -C ${LIB_SSL} depend diff --git a/lib/collissiondetect/LICENSE b/lib/collisiondetect/LICENSE similarity index 100% rename from lib/collissiondetect/LICENSE rename to lib/collisiondetect/LICENSE diff --git a/lib/collissiondetect/Makefile b/lib/collisiondetect/Makefile similarity index 100% rename from lib/collissiondetect/Makefile rename to lib/collisiondetect/Makefile diff --git a/lib/collissiondetect/README b/lib/collisiondetect/README similarity index 100% rename from lib/collissiondetect/README rename to lib/collisiondetect/README diff --git a/lib/collissiondetect/lib/libdetectcoll.c b/lib/collisiondetect/lib/libdetectcoll.c similarity index 100% rename from lib/collissiondetect/lib/libdetectcoll.c rename to lib/collisiondetect/lib/libdetectcoll.c diff --git a/lib/collissiondetect/lib/libdetectcoll.h b/lib/collisiondetect/lib/libdetectcoll.h similarity index 100% rename from lib/collissiondetect/lib/libdetectcoll.h rename to lib/collisiondetect/lib/libdetectcoll.h diff --git a/lib/collissiondetect/src/main.c b/lib/collisiondetect/src/main.c similarity index 100% rename from lib/collissiondetect/src/main.c rename to lib/collisiondetect/src/main.c diff --git a/lib/collissiondetect/tests/md5_1a.pdf b/lib/collisiondetect/tests/md5_1a.pdf similarity index 100% rename from lib/collissiondetect/tests/md5_1a.pdf rename to lib/collisiondetect/tests/md5_1a.pdf diff --git a/lib/collissiondetect/tests/md5_1b.pdf b/lib/collisiondetect/tests/md5_1b.pdf similarity index 100% rename from lib/collissiondetect/tests/md5_1b.pdf rename to lib/collisiondetect/tests/md5_1b.pdf diff --git a/lib/collissiondetect/tests/md5_2a.bin b/lib/collisiondetect/tests/md5_2a.bin similarity index 100% rename from lib/collissiondetect/tests/md5_2a.bin rename to lib/collisiondetect/tests/md5_2a.bin diff --git a/lib/collissiondetect/tests/md5_2b.bin b/lib/collisiondetect/tests/md5_2b.bin similarity index 100% rename from lib/collissiondetect/tests/md5_2b.bin rename to lib/collisiondetect/tests/md5_2b.bin diff --git a/lib/collissiondetect/tests/md5_3a.exe b/lib/collisiondetect/tests/md5_3a.exe similarity index 100% rename from lib/collissiondetect/tests/md5_3a.exe rename to lib/collisiondetect/tests/md5_3a.exe diff --git a/lib/collissiondetect/tests/md5_3b.exe b/lib/collisiondetect/tests/md5_3b.exe similarity index 100% rename from lib/collissiondetect/tests/md5_3b.exe rename to lib/collisiondetect/tests/md5_3b.exe diff --git a/lib/collissiondetect/tests/md5_4a.exe b/lib/collisiondetect/tests/md5_4a.exe similarity index 100% rename from lib/collissiondetect/tests/md5_4a.exe rename to lib/collisiondetect/tests/md5_4a.exe diff --git a/lib/collissiondetect/tests/md5_4b.exe b/lib/collisiondetect/tests/md5_4b.exe similarity index 100% rename from lib/collissiondetect/tests/md5_4b.exe rename to lib/collisiondetect/tests/md5_4b.exe diff --git a/lib/collissiondetect/tests/md5_5a.cert.tobesignedpart b/lib/collisiondetect/tests/md5_5a.cert.tobesignedpart similarity index 100% rename from lib/collissiondetect/tests/md5_5a.cert.tobesignedpart rename to lib/collisiondetect/tests/md5_5a.cert.tobesignedpart diff --git a/lib/collissiondetect/tests/md5_5b.cert.tobesignedpart b/lib/collisiondetect/tests/md5_5b.cert.tobesignedpart similarity index 100% rename from lib/collissiondetect/tests/md5_5b.cert.tobesignedpart rename to lib/collisiondetect/tests/md5_5b.cert.tobesignedpart diff --git a/lib/collissiondetect/tests/sha1_reducedsha_coll.bin b/lib/collisiondetect/tests/sha1_reducedsha_coll.bin similarity index 100% rename from lib/collissiondetect/tests/sha1_reducedsha_coll.bin rename to lib/collisiondetect/tests/sha1_reducedsha_coll.bin diff --git a/test/Makefile b/test/Makefile index 68e794e..de35baa 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++ @@ -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 # --------