In EC_KEY_set_public_key_affine_coordinates include explicit check to see passed...

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index cb7893e43d5d2837bc460f801c5ae34e3f6edd3d..30e0ed66caca9107b2a8a593fcc304f33bb4e270 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -100,6 +100,7 @@ RMD160_ASM_OBJ=
 WP_ASM_OBJ=
 CMLL_ENC=
 MODES_ASM_OBJ=
+ENGINES_ASM_OBJ=
 PERLASM_SCHEME=
 
 # KRB5 stuff
@@ -232,6 +233,7 @@ BUILDENV=   PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
                RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)'              \
                WP_ASM_OBJ='$(WP_ASM_OBJ)'                      \
                MODES_ASM_OBJ='$(MODES_ASM_OBJ)'                \
+               ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)'            \
                PERLASM_SCHEME='$(PERLASM_SCHEME)'              \
                FIPSLIBDIR='${FIPSLIBDIR}'                      \
                FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}"      \
@@ -375,7 +377,7 @@ build_crypto:
 build_ssl:
        @dir=ssl; target=all; $(BUILD_ONE_CMD)
 build_engines:
-       @dir=engines; target=all; $(BUILD_ONE_CMD)
+       @dir=engines; target=all; AS='$(CC) -c'; export AS; $(BUILD_ONE_CMD)
 build_apps:
        @dir=apps; target=all; $(BUILD_ONE_CMD)
 build_tests:
@@ -490,7 +492,7 @@ Makefile: Makefile.org Configure config
        @false
 
 libclean:
-       rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
+       rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib
 
 clean: libclean
        rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
@@ -645,7 +647,7 @@ install_sw:
        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
        done;
        @set -e; target=install; $(RECURSIVE_BUILD_CMD)
-       @set -e; for i in "$(LIBS)" ;\
+       @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
        do \
                if [ -f "$$i" ]; then \
                (       echo installing $$i; \