summaryrefslogtreecommitdiffstats
path: root/Makefile.fips
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-02-21 16:00:21 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-02-21 16:00:21 +0000
commit4a716f5beb2788fde688bd24bfd5fc90100e59ab (patch)
treea0657440b7b627a6e62443f2057ba4564dfe37d0 /Makefile.fips
parente3496215a2b6f28ecd0f0dc9f7a065a82ac34af2 (diff)
tools and rehash not needed for fips build.
Diffstat (limited to 'Makefile.fips')
-rw-r--r--Makefile.fips19
1 files changed, 4 insertions, 15 deletions
diff --git a/Makefile.fips b/Makefile.fips
index f5a95a4c83..ef988fc038 100644
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -140,7 +140,7 @@ FIPSCANLIB=
BASEADDR=
-DIRS= crypto fips test tools
+DIRS= crypto fips test
ENGDIRS= ccgost
SHLIBDIRS= crypto
@@ -353,7 +353,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
../crypto/uid.o
sub_all: build_all
-build_all: build_libs build_tests build_tools
+build_all: build_libs build_tests
build_libs: build_crypto build_fips
@@ -494,7 +494,7 @@ libclean:
rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
clean: libclean
- rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
+ rm -f shlib/*.o *.o core a.out fluff testlog make.log cctest cctest.c
@set -e; target=clean; $(RECURSIVE_BUILD_CMD)
rm -f $(LIBS)
rm -f openssl.pc libssl.pc libcrypto.pc
@@ -526,20 +526,9 @@ dclean:
rm -rf *.bak include/openssl certs/.0
@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
-rehash: rehash.time
-rehash.time: certs apps
- @if [ -z "$(CROSS_COMPILE)" ]; then \
- (OPENSSL="`pwd`/util/opensslwrap.sh"; \
- [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
- OPENSSL_DEBUG_MEMORY=on; \
- export OPENSSL OPENSSL_DEBUG_MEMORY; \
- $(PERL) tools/c_rehash certs) && \
- touch rehash.time; \
- else :; fi
-
test: tests
-tests: rehash
+tests:
@(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