Handle partial test where H is absent: needed to check g generation.
[openssl.git] / Makefile.org
index 492ee2d..a81dc51 100644 (file)
@@ -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)}"      \
@@ -268,9 +270,6 @@ BUILD_ONE_CMD=\
 reflect:
        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 
-
-# FIXME
-
 FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/aes/aes_ecb.o \
        ../crypto/aes/aes_ofb.o \
@@ -325,13 +324,19 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/ecdsa/ecs_ossl.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \
+       ../crypto/evp/e_null.o \
        ../crypto/evp/m_sha1.o \
+       ../crypto/evp/m_dss1.o \
+       ../crypto/evp/m_dss.o \
+       ../crypto/evp/m_ecdsa.o \
        ../crypto/hmac/hmac.o \
        ../crypto/modes/cbc128.o \
+       ../crypto/modes/ccm128.o \
        ../crypto/modes/cfb128.o \
        ../crypto/modes/ctr128.o \
        ../crypto/modes/gcm128.o \
        ../crypto/modes/ofb128.o \
+       ../crypto/modes/xts128.o \
        ../crypto/rsa/rsa_eay.o \
        ../crypto/rsa/rsa_gen.o \
        ../crypto/rsa/rsa_crpt.o \
@@ -372,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:
@@ -642,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; \