Give consistent return value and add error code for duplicate certificates.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 0dca6317fd55bd5ed364e5292fc2be04795acda7..249e57321902a33c13e0fa0871e4905a74e62e0e 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -98,6 +98,7 @@ SHA1_ASM_OBJ=
 RMD160_ASM_OBJ= 
 WP_ASM_OBJ=
 CMLL_ENC=
+PERLASM_SCHEME=
 
 # KRB5 stuff
 KRB5_INCLUDES=
@@ -118,7 +119,7 @@ SDIRS=  \
        bn ec rsa dsa ecdsa dh ecdh dso engine \
        buffer bio stack lhash rand err \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
-       store pqueue ts
+       store cms pqueue ts 
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -199,6 +200,7 @@ BUILDENV=   PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
                MD5_ASM_OBJ='${MD5_ASM_OBJ}'                    \
                RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'              \
                WP_ASM_OBJ='${WP_ASM_OBJ}'                      \
+               PERLASM_SCHEME='${PERLASM_SCHEME}'              \
                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.
@@ -390,7 +392,7 @@ rehash: rehash.time
 rehash.time: certs apps
        @if [ -z "$(CROSS_COMPILE_PREFIX)" ]; then \
                (OPENSSL="`pwd`/util/opensslwrap.sh"; \
-               [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe"; \
+               [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
                OPENSSL_DEBUG_MEMORY=on; \
                export OPENSSL OPENSSL_DEBUG_MEMORY; \
                $(PERL) tools/c_rehash certs) && \
@@ -422,6 +424,9 @@ errors:
        (cd engines; $(MAKE) PERL=$(PERL) errors)
        $(PERL) util/ck_errf.pl */*.c */*/*.c
 
+stacks:
+       $(PERL) util/mkstack.pl -write
+
 util/libeay.num::
        $(PERL) util/mkdef.pl crypto update
 
@@ -446,7 +451,7 @@ TABLE: Configure
        (echo 'Output of `Configure TABLE'"':"; \
        $(PERL) Configure TABLE) > TABLE
 
-update: errors util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
+update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
 
 # Build distribution tar-file. As the list of files returned by "find" is
 # pretty long, on several platforms a "too many arguments" error or similar