upd: build system to handle openssl correctly

diff --git a/Makefile b/Makefile
index ed3e56858ef6fe70bf9326596ae4720046a4967d..cc0b6ecfe1f999f6ce7da73e5be8eeb63016779f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ libs: ${LIBS}
 
 .PHONY: openssl
 openssl:
-       ${MAKE} -C lib/openssl
+       ${MAKE} -C lib openssl
 
 .PHONY: collissiondetect
 collissiondetect:

diff --git a/lib/Makefile b/lib/Makefile
new file mode 100644 (file)
index 0000000..f96e780
--- /dev/null
+++ b/lib/Makefile
@@ -0,0 +1,12 @@
+LIB_SSL=openssl
+LIB_SSL_FILES= $(shell find ${LIB_SSL} -name "*.c")
+
+openssl: openssl/libcrypto.a
+
+openssl/libcrypto.a: ${LIB_SSL_FILES}
+       cd ${LIB_SSL} && ( [ -f Makefile ] || ./config -DPURIFY )
+       ${MAKE} -C ${LIB_SSL} depend
+       ${MAKE} -C ${LIB_SSL}
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+       ${MAKE} -C ${LIB_SSL} test
+endif

diff --git a/lib/openssl/.gitignore b/lib/openssl/.gitignore
index ffa0f6979add7b7dedc4486340f0a3d808d88e58..ed2eeed7436236d2dc076413a774327f1ecd093f 100644 (file)
--- a/lib/openssl/.gitignore
+++ b/lib/openssl/.gitignore
@@ -9,3 +9,4 @@ lib
 /rehash.time
 /crypto/opensslconf.h
 /Makefile
+*.save