diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-07-24 20:36:46 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-07-24 20:36:46 +0000 |
| commit | f4316c36df46f888b5e63f0efb4af0898a66b272 (patch) | |
| tree | ee3bd93886e41151437f6390cced7b74213ef3ca /Makefile.org | |
| parent | 8886f118db26b4c38e15941ac739bbd9a1b05932 (diff) | |
Avoid loops, and make sure that it's possible to still build shared
libraries even if the "shared" configuration option wasn't chosen.
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Makefile.org b/Makefile.org index 3d718c0dbf..e2c818cea3 100644 --- a/Makefile.org +++ b/Makefile.org @@ -207,7 +207,7 @@ all: Makefile.ssl $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ fi; \ done; \ - if $$need_shlib && [ "$(SHLIB_TARGET)" != "" ]; then :; else \ + if $$need_shlib && [ "$(SHLIB_MARK1)" != "" -o "$(SHLIB_MARK1)" != "" ]; then \ $(MAKE) $(SHARED_LIBS); \ fi @@ -229,14 +229,22 @@ sub_all: $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ fi; \ done; \ - if $$need_shlib && [ "$(SHLIB_TARGET)" != "" ]; then :; else \ + if $$need_shlib && [ "$(SHLIB_MARK1)" != "" -o "$(SHLIB_MARK1)" != "" ]; then \ $(MAKE) $(SHARED_LIBS); \ fi libcrypto.so: libcrypto.a - $(MAKE) $(SHLIB_TARGET) + @if [ "$(SHLIB_TARGET)" != "" ]; then \ + $(MAKE) SHLIBDIRS=crypto $(SHLIB_TARGET); \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ + fi libssl.so: libcrypto.so libssl.a - $(MAKE) $(SHLIB_TARGET) + @if [ "$(SHLIB_TARGET)" != "" ]; then \ + $(MAKE) SHLIBDIRS=ssl $(SHLIB_TARGET); \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ + fi clean-shared: for i in ${SHLIBDIRS}; do \ |