X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Makefile.org;h=629cdaeffd065a7eddb2078638efe3f91bc0b6a4;hp=2f8e472ccf96133bec4543ffd57010b8001faf98;hb=9f07c405bb66d4cba03b00f3a3c1df8bee300120;hpb=26d57a1a9225db13324d6c699753437da4de910c

diff --git a/Makefile.org b/Makefile.org
index 2f8e472ccf..629cdaeffd 100644
--- 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...
 
@@ -216,7 +216,7 @@ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
 		INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'	\
 		LIBDIR='$(LIBDIR)'				\
 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
-		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\
+		DEPFLAG='$(DEPFLAG)'                    	\
 		MAKEDEPPROG='$(MAKEDEPPROG)'			\
 		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\
 		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
@@ -437,7 +437,13 @@ 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 && \
+	        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. list-tests)
 
 report:
 	@$(PERL) util/selftest.pl
@@ -462,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