X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Makefile.fips;h=245b5922dd456bc7f8c5bb6bb0c9a8b69cf713b3;hp=f5a95a4c8362290d20b0d69313384e3f1184a05d;hb=3e446ba347da311d58842f4488cf24ee4d0d95bf;hpb=e3496215a2b6f28ecd0f0dc9f7a065a82ac34af2

diff --git a/Makefile.fips b/Makefile.fips
index f5a95a4c83..245b5922dd 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 
 
@@ -152,6 +152,12 @@ SDIRS=  \
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
+LINKDIRS=  \
+	objects sha hmac des aes modes \
+	bn ec rsa dsa ecdsa dh ecdh engine \
+	buffer bio stack lhash rand err \
+	evp asn1 ui cmac
+
 # tests to perform.  "alltests" is a special word indicating that all tests
 # should be performed.
 TESTS = alltests
@@ -353,7 +359,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 +500,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
@@ -516,7 +522,8 @@ files:
 links:
 	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
 	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
-	@set -e; target=links; $(RECURSIVE_BUILD_CMD)
+	$(BUILDENV) $(MAKE) -C fips links
+	$(BUILDENV) SDIRS='$(LINKDIRS)' $(MAKE) -C crypto links
 
 gentests:
 	@(cd test && echo "generating dummy tests (if needed)..." && \
@@ -526,20 +533,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
@@ -600,7 +596,7 @@ tar:
 	find . -type d -print | xargs chmod 755
 	find . -type f -print | xargs chmod a+r
 	find . -type f -perm -0100 -print | xargs chmod a+x
-	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | $(BUILDENV) $(PERL) util/fipsdist.pl | sort > ../$(TARFILE).list; \
+	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | $(BUILDENV) LINKDIRS='$(LINKDIRS)' $(PERL) util/fipsdist.pl | sort > ../$(TARFILE).list; \
 	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
 	tardy --user_number=0  --user_name=openssl \
 	      --group_number=0 --group_name=openssl \
@@ -621,7 +617,7 @@ dist:
 	$(PERL) Configure dist fipscanisteronly
 	@$(MAKE) dist_pem_h
 	@$(MAKE) SDIRS='$(SDIRS)' clean
-	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar
+	@$(MAKE) -f Makefile.fips TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar
 
 dist_pem_h:
 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)