Remove redundant code

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index b6bce44d95b107e627c8c5f91a53c4ebf0dfd181..629cdaeffd065a7eddb2078638efe3f91bc0b6a4 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -143,7 +143,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 \
-       cms pqueue ts jpake srp store cmac
+       cms pqueue ts jpake srp store cmac ct
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -437,7 +437,9 @@ test:   tests
 tests: rehash
        @(cd test && echo "testing..." && \
        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );
-       OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a
+       @if [ -z "$(CROSS_COMPILE)" ]; then \
+               OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a; \
+       fi
 
 list-tests:
        @(cd test && \
@@ -466,6 +468,7 @@ errors:
        $(PERL) util/ck_errf.pl -strict */*.c */*/*.c
        $(PERL) util/mkerr.pl -recurse -write
        (cd engines; $(MAKE) PERL=$(PERL) errors)
+       (cd crypto/ct; $(MAKE) PERL=$(PERL) errors)
 
 stacks:
        $(PERL) util/mkstack.pl -write