Further TLS extension improvements

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index ec96428985eb4a0632db508d8a361e3258a693dc..0fca7194c9bff23bcb16ea6867d9158ff5db41da 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -95,18 +95,23 @@ RC5_ENC= rc5_enc.o
 MD5_ASM_OBJ= 
 SHA1_ASM_OBJ= 
 RMD160_ASM_OBJ= 
+WP_ASM_OBJ=
 
 # KRB5 stuff
 KRB5_INCLUDES=
 LIBKRB5=
 
+# Zlib stuff
+ZLIB_INCLUDE=
+LIBZLIB=
+
 DIRS=   crypto ssl engines apps test tools
 SHLIBDIRS= crypto ssl
 
 # dirs in crypto to build
 SDIRS=  \
        objects \
-       md2 md4 md5 sha mdc2 hmac ripemd \
+       md2 md4 md5 sha mdc2 hmac ripemd whrlpool \
        des aes rc2 rc4 rc5 idea bf cast \
        bn ec rsa dsa ecdsa dh ecdh dso engine \
        buffer bio stack lhash rand err \
@@ -187,6 +192,7 @@ BUILDENV=   PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
                SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'                  \
                MD5_ASM_OBJ='${MD5_ASM_OBJ}'                    \
                RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'              \
+               WP_ASM_OBJ='${WP_ASM_OBJ}'                      \
                THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
 # MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
 # which in turn eliminates ambiguities in variable treatment with -e.
@@ -207,21 +213,21 @@ build_all: build_libs build_apps build_tests build_tools
 build_libs: build_crypto build_ssl build_engines
 
 build_crypto:
-       @dir=crypto; target=all; $(BUILD_CMD)
+       @dir=crypto; target=all; $(RECURSIVE_BUILD_CMD)
 build_ssl:
-       @dir=ssl; target=all; $(BUILD_CMD)
+       @dir=ssl; target=all; $(RECURSIVE_BUILD_CMD)
 build_engines:
-       @dir=engines; target=all; $(BUILD_CMD)
+       @dir=engines; target=all; $(RECURSIVE_BUILD_CMD)
 build_apps:
-       @dir=apps; target=all; $(BUILD_CMD)
+       @dir=apps; target=all; $(RECURSIVE_BUILD_CMD)
 build_tests:
-       @dir=test; target=all; $(BUILD_CMD)
+       @dir=test; target=all; $(RECURSIVE_BUILD_CMD)
 build_tools:
-       @dir=tools; target=all; $(BUILD_CMD)
+       @dir=tools; target=all; $(RECURSIVE_BUILD_CMD)
 
 all_testapps: build_libs build_testapps
 build_testapps:
-       @dir=crypto; target=testapps; $(BUILD_CMD)
+       @dir=crypto; target=testapps; $(RECURSIVE_BUILD_CMD)
 
 libcrypto$(SHLIB_EXT): libcrypto.a
        @if [ "$(SHLIB_TARGET)" != "" ]; then \
@@ -255,7 +261,7 @@ clean-shared:
 
 link-shared:
        @ set -e; for i in ${SHLIBDIRS}; do \
-               $(MAKE) -f $(HERE)/Makefile.shared \
+               $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
                        LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
                        LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
                        symlink.$(SHLIB_TARGET); \