diff options
| author | Rob Austein <sra@hactrn.net> | 2011-03-04 17:59:22 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-03-04 17:59:22 +0000 |
| commit | 2d41f9c7edc9cdb3521e48ce70b2f3626ad011cf (patch) | |
| tree | bd38f65cfccc033db12f290b419e478f1eed92d9 /openssl | |
| parent | 541d3f190fc595cbf542a284eb97da492dd3df45 (diff) | |
Don't rebuild openssl/apps/openssl unless library has changed.
Shared library control is [no-]shared, not {enable,disable}-shared;
fortunately the default seems to be shared on platforms where it
matters, which is why nobody noticed the error.
svn path=/openssl/Makefile.in; revision=3716
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/Makefile.in | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/openssl/Makefile.in b/openssl/Makefile.in index 76c2c006..56994d8a 100644 --- a/openssl/Makefile.in +++ b/openssl/Makefile.in @@ -18,19 +18,33 @@ libdir = @libdir@ # position independent code, so we need OpenSSL compiled with the # options it would use for a shared library. This then requires # further gymnastics to get an openssl executable linked against the -# static libraries, which we want so that we don't have to set -# LD_LIBRARY_PATH in all of our test scripts. +# static libraries. Fortunately, the top-level OpenSSL Makefile has +# generic target labels for the several stages of this build process, +# so we can just call them one at a time and tweak around the edges. -OPTIONS = enable-rfc3779 enable-cms no-dso enable-shared --prefix=${prefix} +OPTIONS = enable-rfc3779 enable-cms no-dso shared --prefix=${prefix} -all: openssl-${VERSION}/Makefile - cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=${PYWRAP_LIBDIR} +all: build_libs build_apps build_tests build_tools build_symlink + +build_libs: openssl-${VERSION}/Makefile + cd openssl-${VERSION}; ${MAKE} build_libs LIBRPATH=${PYWRAP_LIBDIR} + +build_apps: openssl-${VERSION}/apps/openssl + +openssl-${VERSION}/apps/openssl: openssl-${VERSION}/libcrypto.a openssl-${VERSION}/libssl.a cd openssl-${VERSION}; mkdir disabled cd openssl-${VERSION}; mv -fv ${OPENSSL_SO_GLOB} disabled cd openssl-${VERSION}; rm -f apps/openssl cd openssl-${VERSION}; ${MAKE} build_apps cd openssl-${VERSION}; mv -fv disabled/${OPENSSL_SO_GLOB} . cd openssl-${VERSION}; rmdir disabled + +build_tests build_tools: openssl-${VERSION}/apps/openssl + cd openssl-${VERSION}; ${MAKE} $@ + +build_symlink: openssl + +openssl: openssl-${VERSION}/. ln -sf openssl-${VERSION} openssl clean: |