Make "make links" work in fipscanisteronly builds.

[openssl.git] / Makefile.fips

diff --git a/Makefile.fips b/Makefile.fips
index 7ed8a34f93cb8234385df7f1e6300cfe45fe9844..245b5922dd456bc7f8c5bb6bb0c9a8b69cf713b3 100644 (file)
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -154,10 +154,9 @@ SDIRS=  \
 
 LINKDIRS=  \
        objects sha hmac des aes modes \
-       bn ec rsa dsa ecdsa dh ecdh dso engine \
+       bn ec rsa dsa ecdsa dh ecdh engine \
        buffer bio stack lhash rand err \
-       evp asn1 pem x509 x509v3 pkcs7 ocsp ui krb5 \
-       cmac
+       evp asn1 ui cmac
 
 # tests to perform.  "alltests" is a special word indicating that all tests
 # should be performed.
@@ -523,8 +522,8 @@ files:
 links:
        @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
        @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
-       $(MAKE) -C fips links
-       SDIRS='$(LINKDIRS)' $(MAKE) -C crypto links
+       $(BUILDENV) $(MAKE) -C fips links
+       $(BUILDENV) SDIRS='$(LINKDIRS)' $(MAKE) -C crypto links
 
 gentests:
        @(cd test && echo "generating dummy tests (if needed)..." && \
@@ -597,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 \
@@ -618,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)