From 0c4572aa72c2aeb2daf4027278138b6266bfb9b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Wed, 3 Dec 2014 22:05:20 +0100 Subject: [PATCH] upd: build system to handle openssl correctly --- Makefile | 2 +- lib/Makefile | 12 ++++++++++++ lib/openssl/.gitignore | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 lib/Makefile diff --git a/Makefile b/Makefile index ed3e568..cc0b6ec 100644 --- 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 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 ffa0f69..ed2eeed 100644 --- a/lib/openssl/.gitignore +++ b/lib/openssl/.gitignore @@ -9,3 +9,4 @@ lib /rehash.time /crypto/opensslconf.h /Makefile +*.save -- 2.39.2