Commit 6ceb1e8e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Remove unused build targets from Makefile.fips, add cmac to dist list.

parent 1f91af5e

Makefile.fips

+2 −116
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ SDIRS= \ 


LINKDIRS=  \

	objects sha hmac des aes modes \

	bn ec rsa dsa ecdh ecdsa dh engine \

	bn ec rsa dsa ecdh cmac ecdsa dh engine \

	buffer bio stack lhash rand err \

	evp asn1 ui
@@ -618,7 +618,7 @@ dist: 
dist_pem_h:

	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)



install: all install_docs install_sw

install: all install_sw



install_sw:

	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
@@ -645,120 +645,6 @@ install_sw: 
			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \

		fi; \

	done;

	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \

		tmp="$(SHARED_LIBS)"; \

		for i in $${tmp:-x}; \

		do \

			if [ -f "$$i" -o -f "$$i.a" ]; then \

			(       echo installing $$i; \

				if [ "$(PLATFORM)" != "Cygwin" ]; then \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \

				else \

					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \

					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \

					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \

				fi ); \

				if expr $(PLATFORM) : 'mingw' > /dev/null; then \

				(	case $$i in \

						*crypto*) i=libeay32.dll;; \

						*ssl*)    i=ssleay32.dll;; \

					esac; \

					echo installing $$i; \

	 				cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

	 				chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

	 				mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \

				fi; \

			fi; \

		done; \

		(	here="`pwd`"; \

			cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \

			$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \

		if [ "$(INSTALLTOP)" != "/usr" ]; then \

			echo 'OpenSSL shared libraries have been installed in:'; \

			echo '  $(INSTALLTOP)'; \

			echo ''; \

			sed -e '1,/^$$/d' doc/openssl-shared.txt; \

		fi; \

	fi

	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc

	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc

	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc



install_html_docs:

	here="`pwd`"; \

	for subdir in apps crypto ssl; do \

		mkdir -p $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \

		for i in doc/$$subdir/*.pod; do \

			fn=`basename $$i .pod`; \

			echo "installing html/$$fn.$(HTMLSUFFIX)"; \

			cat $$i \

			| sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \

			| pod2html --podroot=doc --htmlroot=.. --podpath=apps:crypto:ssl \

			| sed -r 's/<!DOCTYPE.*//g' \

			> $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \

			$(PERL) util/extract-names.pl < $$i | \

				grep -v $$filecase "^$$fn\$$" | \

				(cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \

				 while read n; do \

					PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \

				 done); \

		done; \

	done



install_docs:

	@$(PERL) $(TOP)/util/mkdir-p.pl \

		$(INSTALL_PREFIX)$(MANDIR)/man1 \

		$(INSTALL_PREFIX)$(MANDIR)/man3 \

		$(INSTALL_PREFIX)$(MANDIR)/man5 \

		$(INSTALL_PREFIX)$(MANDIR)/man7

	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \

	here="`pwd`"; \

	filecase=; \

	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \

		filecase=-i; \

	fi; \

	set -e; for i in doc/apps/*.pod; do \

		fn=`basename $$i .pod`; \

		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \

		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \

		(cd `$(PERL) util/dirname.pl $$i`; \

		sh -c "$$pod2man \

			--section=$$sec --center=OpenSSL \

			--release=$(VERSION) `basename $$i`") \

			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \

		$(PERL) util/extract-names.pl < $$i | \

			(grep -v $$filecase "^$$fn\$$"; true) | \

			(grep -v "[	]"; true) | \

			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \

			 while read n; do \

				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

			 done); \

	done; \

	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \

		fn=`basename $$i .pod`; \

		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \

		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \

		(cd `$(PERL) util/dirname.pl $$i`; \

		sh -c "$$pod2man \

			--section=$$sec --center=OpenSSL \

			--release=$(VERSION) `basename $$i`") \

			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \

		$(PERL) util/extract-names.pl < $$i | \

			(grep -v $$filecase "^$$fn\$$"; true) | \

			(grep -v "[	]"; true) | \

			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \

			 while read n; do \

				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

			 done); \

	done



# DO NOT DELETE THIS LINE -- make depend depends on it.