tools and rehash not needed for fips build.

diff --git a/Makefile.fips b/Makefile.fips
index f5a95a4c8362290d20b0d69313384e3f1184a05d..ef988fc03855b75aab391f1d1acdfa028287e3eb 100644 (file)
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -140,7 +140,7 @@ FIPSCANLIB=
 
 BASEADDR=
 
 
 BASEADDR=
 

-DIRS=   crypto fips test tools
+DIRS=   crypto fips test 

 ENGDIRS= ccgost
 SHLIBDIRS= crypto 
 
 ENGDIRS= ccgost
 SHLIBDIRS= crypto 
 


@@ -353,7 +353,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/uid.o
 
 sub_all: build_all
        ../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
 
 
 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 *.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
        @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)
 
        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
 
 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
        @(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