diff options
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/Makefile.in | 21 | ||||
| -rw-r--r-- | openssl/tests/Makefile | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/openssl/Makefile.in b/openssl/Makefile.in index 6c2d7ad5..4ba1f8e3 100644 --- a/openssl/Makefile.in +++ b/openssl/Makefile.in @@ -1,5 +1,12 @@ # $Id$ +VERSION = 1.0.0b + +OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@ +OPENSSL_BUILD_DIRECTORY = @abs_builddir@/openssl +OPENSSL_SHARED_LIBRARIES = @OPENSSL_SHARED_LIBRARIES@ + + # Kludge alert: # # The --prefix= and LIBRPATH= settings below are to force OpenSSL's @@ -15,13 +22,7 @@ # "You are lost in a maze of twisty programs, all broken in different # ways" -VERSION = 1.0.0b - -OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@ - -OPENSSL_BUILD_DIRECTORY = @abs_builddir@/openssl - -OPTIONS = enable-rfc3779 enable-cms no-dso @OPENSSL_SHARED_LIBRARIES@ --prefix=${OPENSSL_BUILD_DIRECTORY} +OPTIONS = enable-rfc3779 enable-cms no-dso ${OPENSSL_SHARED_LIBRARIES} --prefix=${OPENSSL_BUILD_DIRECTORY} all: openssl-${VERSION}/Makefile cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=${OPENSSL_BUILD_DIRECTORY} @@ -31,9 +32,9 @@ clean: rm -rf openssl-${VERSION} openssl cd tests; ${MAKE} $@ -# Ordinarily we let ./config guess the platform target. When -# debugging, we usually need to specify an explicit target, in which -# case it's probably easier to use ./Configure. +distclean: clean + cd tests; ${MAKE} $@ + rm -f Makefile openssl-${VERSION}/Makefile: openssl-${VERSION}/config cd openssl-${VERSION}; ${OPENSSL_CONFIG_COMMAND} ${OPTIONS} diff --git a/openssl/tests/Makefile b/openssl/tests/Makefile index 8e0c14e5..4e38c699 100644 --- a/openssl/tests/Makefile +++ b/openssl/tests/Makefile @@ -26,5 +26,5 @@ test: ${BIN} test.cer test.cer: test.conf ${OPENSSL_DIR}/apps/openssl req -new -x509 -config test.conf -keyout test.key -out test.cer -outform DER -immaculate: clean +distclean: clean rm -f test.key test.cer |