remove generated files and generated symlinks (in make clean)

3 files changed, 85 insertions, 388 deletions

diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile
index f5306e7fc1d..c771ea8b6f4 100644
--- a/lib/libssl/Makefile
+++ b/lib/libssl/Makefile
@@ -1,5 +1,5 @@
 # Build wrapper for OpenSSL
-# $OpenBSD: Makefile,v 1.10 2002/06/07 06:26:17 beck Exp $
+# $OpenBSD: Makefile,v 1.11 2002/08/30 10:24:16 markus Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -13,24 +13,95 @@ OPENSSLDIR=	/etc/ssl
 SSLCONF=	--openssldir="${OPENSSLDIR}" OpenBSD-${MACHINE_ARCH}
 
 MUNGEDFILES= \
-	${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h \
-	${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h \
-	${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h \
-	${.OBJDIR}/${SSL_SRC}/Makefile.ssl \
 	${.OBJDIR}/${SSL_SRC}/Makefile \
-	${.OBJDIR}/${SSL_SRC}/apps/der_chop \
-	${.OBJDIR}/${SSL_SRC}/tools/c_rehash \
+	${.OBJDIR}/${SSL_SRC}/Makefile.ssl \
 	${.OBJDIR}/${SSL_SRC}/apps/CA.pl \
 	${.OBJDIR}/${SSL_SRC}/apps/CA.pl.bak \
-	${.OBJDIR}/des_random_key.pm \
+	${.OBJDIR}/${SSL_SRC}/apps/Makefile \
+	${.OBJDIR}/${SSL_SRC}/apps/der_chop \
+	${.OBJDIR}/${SSL_SRC}/crypto/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/aes/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/asn1/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/bf/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/bio/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/bn/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/buffer/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/cast/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/comp/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/conf/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/des/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/des/asm/perlasm \
+	${.OBJDIR}/${SSL_SRC}/crypto/dh/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/dsa/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/dso/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/ec/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/engine/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/err/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/evp/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/hmac/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/idea/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/krb5/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/lhash/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/md2/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/md4/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/md5/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/mdc2/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/objects/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h \
+	${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_mac.h \
+	${.OBJDIR}/${SSL_SRC}/crypto/ocsp/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h \
+	${.OBJDIR}/${SSL_SRC}/crypto/pem/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/pkcs12/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/pkcs7/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/rand/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/rc2/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/rc4/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/rc5/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/ripemd/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/rsa/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/sha/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/stack/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/txt_db/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/ui/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/x509/Makefile \
+	${.OBJDIR}/${SSL_SRC}/crypto/x509v3/Makefile \
+	${.OBJDIR}/${SSL_SRC}/ssl/Makefile \
+	${.OBJDIR}/${SSL_SRC}/test/Makefile \
+	${.OBJDIR}/${SSL_SRC}/test/bftest.c \
+	${.OBJDIR}/${SSL_SRC}/test/bntest.c \
+	${.OBJDIR}/${SSL_SRC}/test/casttest.c \
+	${.OBJDIR}/${SSL_SRC}/test/destest.c \
+	${.OBJDIR}/${SSL_SRC}/test/dhtest.c \
+	${.OBJDIR}/${SSL_SRC}/test/dsatest.c \
+	${.OBJDIR}/${SSL_SRC}/test/ectest.c \
+	${.OBJDIR}/${SSL_SRC}/test/evp_test.c \
+	${.OBJDIR}/${SSL_SRC}/test/evptests.txt \
+	${.OBJDIR}/${SSL_SRC}/test/exptest.c \
+	${.OBJDIR}/${SSL_SRC}/test/hmactest.c \
+	${.OBJDIR}/${SSL_SRC}/test/ideatest.c \
+	${.OBJDIR}/${SSL_SRC}/test/md2test.c \
+	${.OBJDIR}/${SSL_SRC}/test/md5test.c \
+	${.OBJDIR}/${SSL_SRC}/test/mdc2test.c \
+	${.OBJDIR}/${SSL_SRC}/test/randtest.c \
+	${.OBJDIR}/${SSL_SRC}/test/rc2test.c \
+	${.OBJDIR}/${SSL_SRC}/test/rc4test.c \
+	${.OBJDIR}/${SSL_SRC}/test/rc5test.c \
+	${.OBJDIR}/${SSL_SRC}/test/rmdtest.c \
+	${.OBJDIR}/${SSL_SRC}/test/sha1test.c \
+	${.OBJDIR}/${SSL_SRC}/test/shatest.c \
+	${.OBJDIR}/${SSL_SRC}/test/ssltest.c \
+	${.OBJDIR}/${SSL_SRC}/tools/Makefile \
+	${.OBJDIR}/${SSL_SRC}/tools/c_rehash \
+	${.OBJDIR}/BUF_MEM_new.pm \
+	${.OBJDIR}/CRYPTO_set_locking_callback.pm \
 	${.OBJDIR}/HMAC.pm \
 	${.OBJDIR}/MD5.pm \
 	${.OBJDIR}/MDC2.pm \
-	${.OBJDIR}/SHA1.pm \
-	${.OBJDIR}/BUF_MEM_new.pm \
 	${.OBJDIR}/RC4.pm \
 	${.OBJDIR}/RIPEMD160.pm \
-	${.OBJDIR}/CRYPTO_set_locking_callback.pm
+	${.OBJDIR}/SHA1.pm \
+	${.OBJDIR}/des_random_key.pm
 
 .include <bsd.own.mk>		# for NOMAN
 
@@ -949,7 +1020,9 @@ ${.OBJDIR}/${SSL_SRC}/Makefile.org: ${.CURDIR}/${SSL_SRC}/Makefile.org
 .if ${.OBJDIR} == ${.CURDIR}
 clean: prereq
 	@cd ${.OBJDIR}/crypto && ${MAKE} clean
-	@cd ${.OBJDIR}/ssl && ${MAKE} clean && rm -f ${MUNGEDFILES}
+	@cd ${.OBJDIR}/ssl && ${MAKE} clean
+	@rm -f ${MUNGEDFILES}
+	@rm -rf ${.OBJDIR}/${SSL_SRC}/include
 .else 	
 clean:
 	@cd ${.OBJDIR} && find . \! -type d -print | xargs rm
diff --git a/lib/libssl/src/apps/CA.pl b/lib/libssl/src/apps/CA.pl
deleted file mode 100644
index 64ad92eb788..00000000000
--- a/lib/libssl/src/apps/CA.pl
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/perl
-#
-# CA - wrapper around ca to make it easier to use ... basically ca requires
-#      some setup stuff to be done before you can use it and this makes
-#      things easier between now and when Eric is convinced to fix it :-)
-#
-# CA -newca ... will setup the right stuff
-# CA -newreq[-nodes] ... will generate a certificate request 
-# CA -sign ... will sign the generated request and output 
-#
-# At the end of that grab newreq.pem and newcert.pem (one has the key 
-# and the other the certificate) and cat them together and that is what
-# you want/need ... I'll make even this a little cleaner later.
-#
-#
-# 12-Jan-96 tjh    Added more things ... including CA -signcert which
-#                  converts a certificate to a request and then signs it.
-# 10-Jan-96 eay    Fixed a few more bugs and added the SSLEAY_CONFIG
-#		   environment variable so this can be driven from
-#		   a script.
-# 25-Jul-96 eay    Cleaned up filenames some more.
-# 11-Jun-96 eay    Fixed a few filename missmatches.
-# 03-May-96 eay    Modified to use 'ssleay cmd' instead of 'cmd'.
-# 18-Apr-96 tjh    Original hacking
-#
-# Tim Hudson
-# tjh@cryptsoft.com
-#
-
-# 27-Apr-98 snh    Translation into perl, fix existing CA bug.
-#
-#
-# Steve Henson
-# shenson@bigfoot.com
-
-# default openssl.cnf file has setup as per the following
-# demoCA ... where everything is stored
-
-$SSLEAY_CONFIG=$ENV{"SSLEAY_CONFIG"};
-$DAYS="-days 365";
-$REQ="openssl req $SSLEAY_CONFIG";
-$CA="openssl ca $SSLEAY_CONFIG";
-$VERIFY="openssl verify";
-$X509="openssl x509";
-$PKCS12="openssl pkcs12";
-
-$CATOP="./demoCA";
-$CAKEY="cakey.pem";
-$CACERT="cacert.pem";
-
-$DIRMODE = 0777;
-
-$RET = 0;
-
-foreach (@ARGV) {
-	if ( /^(-\?|-h|-help)$/ ) {
-	    print STDERR "usage: CA -newcert|-newreq|newreq-nodes|-newca|-sign|-verify\n";
-	    exit 0;
-	} elsif (/^-newcert$/) {
-	    # create a certificate
-	    system ("$REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS");
-	    $RET=$?;
-	    print "Certificate (and private key) is in newreq.pem\n"
-	} elsif (/^-newreq$/) {
-	    # create a certificate request
-	    system ("$REQ -new -keyout newreq.pem -out newreq.pem $DAYS");
-	    $RET=$?;
-	    print "Request (and private key) is in newreq.pem\n";
-	} elsif (/^-newreq-nodes$/) {
-	    # create a certificate request
-	    system ("$REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS");
-	    $RET=$?;
-	    print "Request (and private key) is in newreq.pem\n";
-	} elsif (/^-newca$/) {
-		# if explicitly asked for or it doesn't exist then setup the
-		# directory structure that Eric likes to manage things 
-	    $NEW="1";
-	    if ( "$NEW" || ! -f "${CATOP}/serial" ) {
-		# create the directory hierarchy
-		mkdir $CATOP, $DIRMODE;
-		mkdir "${CATOP}/certs", $DIRMODE;
-		mkdir "${CATOP}/crl", $DIRMODE ;
-		mkdir "${CATOP}/newcerts", $DIRMODE;
-		mkdir "${CATOP}/private", $DIRMODE;
-		open OUT, ">${CATOP}/serial";
-		print OUT "01\n";
-		close OUT;
-		open OUT, ">${CATOP}/index.txt";
-		close OUT;
-	    }
-	    if ( ! -f "${CATOP}/private/$CAKEY" ) {
-		print "CA certificate filename (or enter to create)\n";
-		$FILE = <STDIN>;
-
-		chop $FILE;
-
-		# ask user for existing CA certificate
-		if ($FILE) {
-		    cp_pem($FILE,"${CATOP}/private/$CAKEY", "PRIVATE");
-		    cp_pem($FILE,"${CATOP}/$CACERT", "CERTIFICATE");
-		    $RET=$?;
-		} else {
-		    print "Making CA certificate ...\n";
-		    system ("$REQ -new -x509 -keyout " .
-			"${CATOP}/private/$CAKEY -out ${CATOP}/$CACERT $DAYS");
-		    $RET=$?;
-		}
-	    }
-	} elsif (/^-pkcs12$/) {
-	    my $cname = $ARGV[1];
-	    $cname = "My Certificate" unless defined $cname;
-	    system ("$PKCS12 -in newcert.pem -inkey newreq.pem " .
-			"-certfile ${CATOP}/$CACERT -out newcert.p12 " .
-			"-export -name \"$cname\"");
-	    $RET=$?;
-	    exit $RET;
-	} elsif (/^-xsign$/) {
-	    system ("$CA -policy policy_anything -infiles newreq.pem");
-	    $RET=$?;
-	} elsif (/^(-sign|-signreq)$/) {
-	    system ("$CA -policy policy_anything -out newcert.pem " .
-							"-infiles newreq.pem");
-	    $RET=$?;
-	    print "Signed certificate is in newcert.pem\n";
-	} elsif (/^(-signCA)$/) {
-	    system ("$CA -policy policy_anything -out newcert.pem " .
-					"-extensions v3_ca -infiles newreq.pem");
-	    $RET=$?;
-	    print "Signed CA certificate is in newcert.pem\n";
-	} elsif (/^-signcert$/) {
-	    system ("$X509 -x509toreq -in newreq.pem -signkey newreq.pem " .
-								"-out tmp.pem");
-	    system ("$CA -policy policy_anything -out newcert.pem " .
-							"-infiles tmp.pem");
-	    $RET = $?;
-	    print "Signed certificate is in newcert.pem\n";
-	} elsif (/^-verify$/) {
-	    if (shift) {
-		foreach $j (@ARGV) {
-		    system ("$VERIFY -CAfile $CATOP/$CACERT $j");
-		    $RET=$? if ($? != 0);
-		}
-		exit $RET;
-	    } else {
-		    system ("$VERIFY -CAfile $CATOP/$CACERT newcert.pem");
-		    $RET=$?;
-	    	    exit 0;
-	    }
-	} else {
-	    print STDERR "Unknown arg $_\n";
-	    print STDERR "usage: CA -newcert|-newreq|newreq-nodes|-newca|-sign|-verify\n";
-	    exit 1;
-	}
-}
-
-exit $RET;
-
-sub cp_pem {
-my ($infile, $outfile, $bound) = @_;
-open IN, $infile;
-open OUT, ">$outfile";
-my $flag = 0;
-while (<IN>) {
-	$flag = 1 if (/^-----BEGIN.*$bound/) ;
-	print OUT $_ if ($flag);
-	if (/^-----END.*$bound/) {
-		close IN;
-		close OUT;
-		return;
-	}
-}
-}
-
diff --git a/lib/libssl/src/crypto/Makefile b/lib/libssl/src/crypto/Makefile
deleted file mode 100644
index 6759b2e4d0d..00000000000
--- a/lib/libssl/src/crypto/Makefile
+++ /dev/null
@@ -1,203 +0,0 @@
-#
-# SSLeay/crypto/Makefile
-#
-
-DIR=		crypto
-TOP=		..
-CC=		cc
-INCLUDE=	-I. -I../include
-INCLUDES=	-I.. -I../../include
-CFLAG=		-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=	/usr/local/ssl
-MAKE=           make -f Makefile.ssl
-MAKEDEPEND=	$(TOP)/util/domd $(TOP)
-MAKEFILE=       Makefile.ssl
-RM=             rm -f
-AR=		ar r
-
-PEX_LIBS=
-EX_LIBS=
- 
-CFLAGS= $(INCLUDE) $(CFLAG)
-
-
-LIBS=
-
-SDIRS=	md2 md5 sha mdc2 hmac ripemd \
-	des rc2 rc4 rc5 idea bf cast \
-	bn rsa dsa dh dso engine \
-	buffer bio stack lhash rand err objects \
-	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
-
-GENERAL=Makefile README crypto-lib.com install.com
-
-LIB= $(TOP)/libcrypto.a
-LIBSRC=	cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c
-LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o
-
-SRC= $(LIBSRC)
-
-EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h
-HEADER=	cryptlib.h buildinf.h md32_common.h $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-	@(cd ..; $(MAKE) DIRS=$(DIR) all)
-
-all: buildinf.h lib subdirs
-
-buildinf.h: ../Makefile.ssl
-	( echo "#ifndef MK1MF_BUILD"; \
-	echo "  /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
-	echo "  #define CFLAGS \"$(CC) $(CFLAG)\""; \
-	echo "  #define PLATFORM \"$(PLATFORM)\""; \
-	echo "  #define DATE \"`date`\""; \
-	echo "#endif" ) >buildinf.h
-
-testapps:
-	if echo ${SDIRS} | fgrep ' des '; \
-	then cd des && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' des; fi
-	cd pkcs7 && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps
-
-subdirs:
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i && echo "making all in crypto/$$i..." && \
-	$(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
-	done;
-
-files:
-	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i; echo "making 'files' in crypto/$$i..."; \
-	$(MAKE) PERL='${PERL}' files ); \
-	done;
-
-links:
-	@$(SHELL) $(TOP)/util/point.sh Makefile.ssl Makefile
-	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
-	@$(SHELL) $(TOP)/util/point.sh Makefile.ssl Makefile
-	@for i in $(SDIRS); do \
-	(cd $$i; echo "making links in crypto/$$i..."; \
-	$(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \
-	done;
-
-lib:	$(LIBOBJ)
-	$(AR) $(LIB) $(LIBOBJ)
-	@echo You may get an error following this line.  Please ignore.
-	- $(RANLIB) $(LIB)
-	@touch lib
-
-libs:
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i; echo "making libs in crypto/$$i..."; \
-	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
-	done;
-
-tests:
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i; echo "making tests in crypto/$$i..."; \
-	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \
-	done;
-
-install:
-	@for i in $(EXHEADER) ;\
-	do \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i; echo "making install in crypto/$$i..."; \
-	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}'  INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
-	done;
-
-lint:
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i; echo "making lint in crypto/$$i..."; \
-	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \
-	done;
-
-depend:
-	if [ ! -f buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist
-	$(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC)
-	if [ ! -s buildinf.h ]; then rm buildinf.h; fi
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i; echo "making depend in crypto/$$i..."; \
-	$(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \
-	done;
-
-clean:
-	rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i; echo "making clean in crypto/$$i..."; \
-	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \
-	done;
-
-dclean:
-	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-	mv -f Makefile.new $(MAKEFILE)
-	@for i in $(SDIRS) ;\
-	do \
-	(cd $$i; echo "making dclean in crypto/$$i..."; \
-	$(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
-	done;
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-cpt_err.o: ../include/openssl/bio.h ../include/openssl/crypto.h
-cpt_err.o: ../include/openssl/err.h ../include/openssl/lhash.h
-cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-cpt_err.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-cryptlib.o: ../include/openssl/bio.h ../include/openssl/buffer.h
-cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
-cryptlib.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-cryptlib.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-cryptlib.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-cryptlib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
-cversion.o: ../include/openssl/bio.h ../include/openssl/buffer.h
-cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
-cversion.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-cversion.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-cversion.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-cversion.o: ../include/openssl/stack.h ../include/openssl/symhacks.h buildinf.h
-cversion.o: cryptlib.h
-ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h
-ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
-ex_data.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-ex_data.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-ex_data.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
-mem.o: ../include/openssl/bio.h ../include/openssl/buffer.h
-mem.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
-mem.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-mem.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-mem.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-mem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
-mem_dbg.o: ../include/openssl/bio.h ../include/openssl/buffer.h
-mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
-mem_dbg.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-mem_dbg.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-mem_dbg.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
-tmdiff.o: ../include/openssl/bio.h ../include/openssl/buffer.h
-tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
-tmdiff.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-tmdiff.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-tmdiff.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
-tmdiff.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h
-uid.o: ../include/openssl/crypto.h ../include/openssl/opensslv.h
-uid.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-uid.o: ../include/openssl/symhacks.h