diff options
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/Makefile.org b/Makefile.org index 09828b0de9..a2077b0b53 100644 --- a/Makefile.org +++ b/Makefile.org @@ -11,6 +11,7 @@ SHLIB_MAJOR= SHLIB_MINOR= PLATFORM=dist OPTIONS= +CONFIGURE_ARGS= SHLIB_TARGET= # INSTALL_PREFIX is for package builders so that they can configure @@ -160,7 +161,7 @@ SHLIBDIRS= crypto ssl # dirs in crypto to build SDIRS= \ - md2 md5 sha mdc2 hmac ripemd \ + md2 md4 md5 sha mdc2 hmac ripemd \ des rc2 rc4 rc5 idea bf cast \ bn rsa dsa dh dso engine \ buffer bio stack lhash rand err objects \ @@ -241,7 +242,7 @@ libcrypto.so: libcrypto.a fi libssl.so: libcrypto.so libssl.a @if [ "$(SHLIB_TARGET)" != "" ]; then \ - $(MAKE) SHLIBDIRS=ssl $(SHLIB_TARGET); \ + $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-L. -lcrypto' $(SHLIB_TARGET); \ else \ echo "There's no support for shared libraries on this platform" >&2; \ fi @@ -254,47 +255,44 @@ clean-shared: done linux-shared: - libs=; for i in ${SHLIBDIRS}; do \ + libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ rm -f lib$$i.so \ lib$$i.so.${SHLIB_MAJOR} \ lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \ ( set -x; ${CC} -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -Wl,-S,-soname=lib$$i.so.${SHLIB_MAJOR} \ -Wl,--whole-archive lib$$i.a \ - -Wl,--no-whole-archive -lc $$libs ) || exit 1; \ + -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \ libs="$$libs -L. -l$$i"; \ ( set -x; \ ln -s lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ lib$$i.so.${SHLIB_MAJOR}; \ ln -s lib$$i.so.${SHLIB_MAJOR} lib$$i.so ); \ - done; + done # This assumes that GNU utilities are *not* used true64-shared: - libs=; for i in ${SHLIBDIRS}; do \ + libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ ( set -x; ${CC} -shared -no_archive -o lib$$i.so \ -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \ - -all lib$$i.a -none -lc $$libs ) || exit 1; \ + -all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \ libs="$$libs -L. -l$$i"; \ - done; + done # This assumes that GNU utilities are *not* used solaris-shared: - libs=; for i in ${SHLIBDIRS}; do \ + libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ rm -f lib$$i.so \ lib$$i.so.${SHLIB_MAJOR} \ lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \ ( set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR} \ - -z allextract lib$$i.a $$libs ) || exit 1; \ + -z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ libs="$$libs -L. -l$$i"; \ ln -s lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ lib$$i.so.${SHLIB_MAJOR}; \ ln -s lib$$i.so.${SHLIB_MAJOR} lib$$i.so; \ - done; \ - @set -x; \ - for i in ${SHLIBDIRS}; do \ - done; + done Makefile.ssl: Makefile.org @echo "Makefile.ssl is older than Makefile.org." |