expunge more of the old build system

ok deraadt miod

4 files changed, 0 insertions, 1199 deletions

diff --git a/src/lib/libssl/src/apps/Makefile b/src/lib/libssl/src/apps/Makefile
deleted file mode 100644
index ee4916332a..0000000000
--- a/src/lib/libssl/src/apps/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-#  apps/Makefile
-#
-
-DIR=            apps
-TOP=            ..
-CC=             cc
-INCLUDES=       -I$(TOP) -I../include $(KRB5_INCLUDES)
-CFLAG=          -g -static
-MAKEFILE=       Makefile
-PERL=           perl
-RM=             rm -f
-# KRB5 stuff
-KRB5_INCLUDES=
-LIBKRB5=
-
-PEX_LIBS=
-EX_LIBS= 
-EXE_EXT= 
-
-SHLIB_TARGET=
-
-CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile makeapps.com install.com
-
-DLIBCRYPTO=../libcrypto.a
-DLIBSSL=../libssl.a
-LIBCRYPTO=-L.. -lcrypto
-LIBSSL=-L.. -lssl
-
-PROGRAM= openssl
-
-SCRIPTS=CA.sh CA.pl tsget
-
-EXE= $(PROGRAM)$(EXE_EXT)
-
-E_EXE=  verify asn1pars req dgst dh dhparam enc passwd gendh errstr \
-        ca crl rsa rsautl dsa dsaparam ec ecparam \
-        x509 genrsa gendsa genpkey s_server s_client speed \
-        s_time version pkcs7 cms crl2pkcs7 sess_id ciphers nseq pkcs12 \
-        pkcs8 pkey pkeyparam pkeyutl spkac smime rand engine ocsp prime ts srp
-
-PROGS= $(PROGRAM).c
-
-A_OBJ=apps.o
-A_SRC=apps.c
-S_OBJ=  s_cb.o s_socket.o
-S_SRC=  s_cb.c s_socket.c
-RAND_OBJ=app_rand.o
-RAND_SRC=app_rand.c
-
-E_OBJ=  verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o errstr.o \
-        ca.o pkcs7.o crl2p7.o crl.o \
-        rsa.o rsautl.o dsa.o dsaparam.o ec.o ecparam.o \
-        x509.o genrsa.o gendsa.o genpkey.o s_server.o s_client.o speed.o \
-        s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \
-        ciphers.o nseq.o pkcs12.o pkcs8.o pkey.o pkeyparam.o pkeyutl.o \
-        spkac.o smime.o cms.o rand.o engine.o ocsp.o prime.o ts.o srp.o
-
-E_SRC=  verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \
-        pkcs7.c crl2p7.c crl.c \
-        rsa.c rsautl.c dsa.c dsaparam.c ec.c ecparam.c \
-        x509.c genrsa.c gendsa.c genpkey.c s_server.c s_client.c speed.c \
-        s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \
-        ciphers.c nseq.c pkcs12.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c \
-        spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c srp.c
-
-SRC=$(E_SRC)
-
-EXHEADER=
-HEADER= apps.h progs.h s_apps.h \
-        testdsa.h testrsa.h \
-        $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        @(cd ..; $(MAKE) DIRS=$(DIR) all)
-
-all:    exe
-
-exe:    $(EXE)
-
-req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
-        shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
-                shlib_target="$(SHLIB_TARGET)"; \
-        fi; \
-        $(MAKE) -f $(TOP)/Makefile.shared -e \
-                APPNAME=req OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \
-                LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \
-                link_app.$${shlib_target}
-
-sreq.o: req.c 
-        $(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-install:
-        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-        @set -e; for i in $(EXE); \
-        do  \
-        (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 ); \
-         done;
-        @set -e; for i in $(SCRIPTS); \
-        do  \
-        (echo installing $$i; \
-         cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
-         chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
-         mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
-         done
-        @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
-        chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
-        mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-links:
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        @if [ -z "$(THIS)" ]; then \
-            $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
-        else \
-            $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
-        fi
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-        rm -f CA.pl
-
-clean:
-        rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
-        rm -f req
-
-$(DLIBSSL):
-        (cd ..; $(MAKE) DIRS=ssl all)
-
-$(DLIBCRYPTO):
-        (cd ..; $(MAKE) DIRS=crypto all)
-
-$(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
-        $(RM) $(EXE)
-        shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
-                shlib_target="$(SHLIB_TARGET)"; \
-        elif [ -n "$(FIPSCANLIB)" ]; then \
-          FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
-        fi; \
-        LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
-        $(MAKE) -f $(TOP)/Makefile.shared -e \
-                APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
-                link_app.$${shlib_target}
-        @(cd ..; $(MAKE) rehash)
-
-progs.h: progs.pl
-        $(PERL) progs.pl $(E_EXE) >progs.h
-        $(RM) $(PROGRAM).o
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/src/test/Makefile b/src/lib/libssl/src/test/Makefile
deleted file mode 100644
index 608b7abf27..0000000000
--- a/src/lib/libssl/src/test/Makefile
+++ /dev/null
@@ -1,485 +0,0 @@
-#
-# test/Makefile
-#
-
-DIR=            test
-TOP=            ..
-CC=             cc
-INCLUDES=       -I$(TOP) -I../include $(KRB5_INCLUDES)
-CFLAG=          -g
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-PERL=           perl
-# KRB5 stuff
-KRB5_INCLUDES=
-LIBKRB5=
-
-PEX_LIBS=
-EX_LIBS= #-lnsl -lsocket
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile maketests.com \
-        tests.com testenc.com tx509.com trsa.com tcrl.com tsid.com treq.com \
-        tpkcs7.com tpkcs7d.com tverify.com testgen.com testss.com testssl.com \
-        testca.com VMSca-response.1 VMSca-response.2
-
-DLIBCRYPTO= ../libcrypto.a
-DLIBSSL= ../libssl.a
-LIBCRYPTO= -L.. -lcrypto
-LIBSSL= -L.. -lssl
-
-BNTEST=         bntest
-ECTEST=         ectest
-ECDSATEST=      ecdsatest
-ECDHTEST=       ecdhtest
-EXPTEST=        exptest
-IDEATEST=       ideatest
-SHATEST=        shatest
-SHA1TEST=       sha1test
-SHA256TEST=     sha256t
-SHA512TEST=     sha512t
-MDC2TEST=       mdc2test
-RMDTEST=        rmdtest
-MD2TEST=        md2test
-MD4TEST=        md4test
-MD5TEST=        md5test
-HMACTEST=       hmactest
-WPTEST=         wp_test
-RC2TEST=        rc2test
-RC4TEST=        rc4test
-RC5TEST=        rc5test
-BFTEST=         bftest
-CASTTEST=       casttest
-DESTEST=        destest
-RANDTEST=       randtest
-DHTEST=         dhtest
-DSATEST=        dsatest
-METHTEST=       methtest
-SSLTEST=        ssltest
-RSATEST=        rsa_test
-ENGINETEST=     enginetest
-EVPTEST=        evp_test
-IGETEST=        igetest
-JPAKETEST=      jpaketest
-SRPTEST=        srptest
-ASN1TEST=       asn1test
-
-TESTS=          alltests
-
-EXE=    $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT)  $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)$(EXE_EXT) $(IDEATEST)$(EXE_EXT) \
-        $(MD2TEST)$(EXE_EXT)  $(MD4TEST)$(EXE_EXT) $(MD5TEST)$(EXE_EXT) $(HMACTEST)$(EXE_EXT) $(WPTEST)$(EXE_EXT) \
-        $(RC2TEST)$(EXE_EXT) $(RC4TEST)$(EXE_EXT) $(RC5TEST)$(EXE_EXT) \
-        $(DESTEST)$(EXE_EXT) $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT) \
-        $(MDC2TEST)$(EXE_EXT) $(RMDTEST)$(EXE_EXT) \
-        $(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \
-        $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \
-        $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \
-        $(ASN1TEST)$(EXE_EXT)
-
-# $(METHTEST)$(EXE_EXT)
-
-OBJ=    $(BNTEST).o $(ECTEST).o  $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
-        $(MD2TEST).o $(MD4TEST).o $(MD5TEST).o \
-        $(HMACTEST).o $(WPTEST).o \
-        $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
-        $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(SHA256TEST).o $(SHA512TEST).o \
-        $(MDC2TEST).o $(RMDTEST).o \
-        $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \
-        $(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o $(RSATEST).o \
-        $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o
-SRC=    $(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
-        $(MD2TEST).c  $(MD4TEST).c $(MD5TEST).c \
-        $(HMACTEST).c $(WPTEST).c \
-        $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
-        $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
-        $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \
-        $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c $(RSATEST).c \
-        $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c
-
-EXHEADER= 
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd ..; $(MAKE) DIRS=$(DIR) TESTS=$(TESTS) all)
-
-all:    exe
-
-exe:    $(EXE) dummytest$(EXE_EXT)
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-
-generate: $(SRC)
-$(SRC):
-        @sh $(TOP)/util/point.sh dummytest.c $@
-
-errors:
-
-install:
-
-tags:
-        ctags $(SRC)
-
-tests:  exe apps $(TESTS)
-
-apps:
-        @(cd ..; $(MAKE) DIRS=apps all)
-
-alltests: \
-        test_des test_idea test_sha test_md4 test_md5 test_hmac \
-        test_md2 test_mdc2 test_wp \
-        test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \
-        test_rand test_bn test_ec test_ecdsa test_ecdh \
-        test_enc test_x509 test_rsa test_crl test_sid \
-        test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
-        test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \
-        test_jpake test_srp test_cms
-
-test_evp:
-        ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
-
-test_des:
-        ../util/shlib_wrap.sh ./$(DESTEST)
-
-test_idea:
-        ../util/shlib_wrap.sh ./$(IDEATEST)
-
-test_sha:
-        ../util/shlib_wrap.sh ./$(SHATEST)
-        ../util/shlib_wrap.sh ./$(SHA1TEST)
-        ../util/shlib_wrap.sh ./$(SHA256TEST)
-        ../util/shlib_wrap.sh ./$(SHA512TEST)
-
-test_mdc2:
-        ../util/shlib_wrap.sh ./$(MDC2TEST)
-
-test_md5:
-        ../util/shlib_wrap.sh ./$(MD5TEST)
-
-test_md4:
-        ../util/shlib_wrap.sh ./$(MD4TEST)
-
-test_hmac:
-        ../util/shlib_wrap.sh ./$(HMACTEST)
-
-test_wp:
-        ../util/shlib_wrap.sh ./$(WPTEST)
-
-test_md2:
-        ../util/shlib_wrap.sh ./$(MD2TEST)
-
-test_rmd:
-        ../util/shlib_wrap.sh ./$(RMDTEST)
-
-test_bf:
-        ../util/shlib_wrap.sh ./$(BFTEST)
-
-test_cast:
-        ../util/shlib_wrap.sh ./$(CASTTEST)
-
-test_rc2:
-        ../util/shlib_wrap.sh ./$(RC2TEST)
-
-test_rc4:
-        ../util/shlib_wrap.sh ./$(RC4TEST)
-
-test_rc5:
-        ../util/shlib_wrap.sh ./$(RC5TEST)
-
-test_rand:
-        ../util/shlib_wrap.sh ./$(RANDTEST)
-
-test_enc:
-        @sh ./testenc
-
-test_x509:
-        echo test normal x509v1 certificate
-        sh ./tx509 2>/dev/null
-        echo test first x509v3 certificate
-        sh ./tx509 v3-cert1.pem 2>/dev/null
-        echo test second x509v3 certificate
-        sh ./tx509 v3-cert2.pem 2>/dev/null
-
-test_rsa: $(RSATEST)$(EXE_EXT)
-        @sh ./trsa 2>/dev/null
-        ../util/shlib_wrap.sh ./$(RSATEST)
-
-test_crl:
-        @sh ./tcrl 2>/dev/null
-
-test_sid:
-        @sh ./tsid 2>/dev/null
-
-test_req:
-        @sh ./treq 2>/dev/null
-        @sh ./treq testreq2.pem 2>/dev/null
-
-test_pkcs7:
-        @sh ./tpkcs7 2>/dev/null
-        @sh ./tpkcs7d 2>/dev/null
-
-test_bn:
-        @echo starting big number library test, could take a while...
-        @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
-        @echo quit >>tmp.bntest
-        @echo "running bc"
-        @<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
-        @echo 'test a^b%c implementations'
-        ../util/shlib_wrap.sh ./$(EXPTEST)
-
-test_ec:
-        @echo 'test elliptic curves'
-        ../util/shlib_wrap.sh ./$(ECTEST)
-
-test_ecdsa:
-        @echo 'test ecdsa'
-        ../util/shlib_wrap.sh ./$(ECDSATEST)
-
-test_ecdh:
-        @echo 'test ecdh'
-        ../util/shlib_wrap.sh ./$(ECDHTEST)
-
-test_verify:
-        @echo "The following command should have some OK's and some failures"
-        @echo "There are definitly a few expired certificates"
-        ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
-
-test_dh:
-        @echo "Generate a set of DH parameters"
-        ../util/shlib_wrap.sh ./$(DHTEST)
-
-test_dsa:
-        @echo "Generate a set of DSA parameters"
-        ../util/shlib_wrap.sh ./$(DSATEST)
-        ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
-
-test_gen:
-        @echo "Generate and verify a certificate request"
-        @sh ./testgen
-
-test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
-                intP1.ss intP2.ss: testss
-        @echo "Generate and certify a test certificate"
-        @sh ./testss
-        @cat certCA.ss certU.ss > intP1.ss
-        @cat certCA.ss certU.ss certP1.ss > intP2.ss
-
-test_engine: 
-        @echo "Manipulate the ENGINE structures"
-        ../util/shlib_wrap.sh ./$(ENGINETEST)
-
-test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
-                intP1.ss intP2.ss
-        @echo "test SSL protocol"
-        @if [ -n "$(FIPSCANLIB)" ]; then \
-          sh ./testfipsssl keyU.ss certU.ss certCA.ss; \
-        fi
-        ../util/shlib_wrap.sh ./$(SSLTEST) -test_cipherlist
-        @sh ./testssl keyU.ss certU.ss certCA.ss
-        @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
-        @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
-
-test_ca:
-        @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
-          echo "skipping CA.sh test -- requires RSA"; \
-        else \
-          echo "Generate and certify a test certificate via the 'ca' program"; \
-          sh ./testca; \
-        fi
-
-test_aes: #$(AESTEST)
-#       @echo "test Rijndael"
-#       ../util/shlib_wrap.sh ./$(AESTEST)
-
-test_tsa:
-        @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
-          echo "skipping testtsa test -- requires RSA"; \
-        else \
-          sh ./testtsa; \
-        fi
-
-test_ige: $(IGETEST)$(EXE_EXT)
-        @echo "Test IGE mode"
-        ../util/shlib_wrap.sh ./$(IGETEST)
-
-test_jpake: $(JPAKETEST)$(EXE_EXT)
-        @echo "Test JPAKE"
-        ../util/shlib_wrap.sh ./$(JPAKETEST)
-
-test_cms:
-        @echo "CMS consistency test"
-        $(PERL) cms-test.pl
-
-test_srp: $(SRPTEST)$(EXE_EXT)
-        @echo "Test SRP"
-        ../util/shlib_wrap.sh ./srptest
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        @if [ -z "$(THIS)" ]; then \
-            $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
-        else \
-            $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
-        fi
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-        rm -f $(SRC) $(SHA256TEST).c $(SHA512TEST).c evptests.txt newkey.pem testkey.pem \
-                        testreq.pem
-
-clean:
-        rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest
-
-$(DLIBSSL):
-        (cd ..; $(MAKE) DIRS=ssl all)
-
-$(DLIBCRYPTO):
-        (cd ..; $(MAKE) DIRS=crypto all)
-
-BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
-                shlib_target="$(SHLIB_TARGET)"; \
-        fi; \
-        LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
-        $(MAKE) -f $(TOP)/Makefile.shared -e \
-                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
-                link_app.$${shlib_target}
-
-FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
-                shlib_target="$(SHLIB_TARGET)"; \
-        fi; \
-        LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
-        if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
-                FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
-        fi; \
-        $(MAKE) -f $(TOP)/Makefile.shared -e \
-                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
-                link_app.$${shlib_target}
-
-$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
-        @target=$(RSATEST); $(BUILD_CMD)
-
-$(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
-        @target=$(BNTEST); $(BUILD_CMD)
-
-$(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
-        @target=$(ECTEST); $(BUILD_CMD)
-
-$(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
-        @target=$(EXPTEST); $(BUILD_CMD)
-
-$(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
-        @target=$(IDEATEST); $(BUILD_CMD)
-
-$(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
-        @target=$(MD2TEST); $(BUILD_CMD)
-
-$(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
-        @target=$(SHATEST); $(BUILD_CMD)
-
-$(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
-        @target=$(SHA1TEST); $(BUILD_CMD)
-
-$(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
-        @target=$(SHA256TEST); $(BUILD_CMD)
-
-$(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
-        @target=$(SHA512TEST); $(BUILD_CMD)
-
-$(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
-        @target=$(RMDTEST); $(BUILD_CMD)
-
-$(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
-        @target=$(MDC2TEST); $(BUILD_CMD)
-
-$(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
-        @target=$(MD4TEST); $(BUILD_CMD)
-
-$(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
-        @target=$(MD5TEST); $(BUILD_CMD)
-
-$(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
-        @target=$(HMACTEST); $(BUILD_CMD)
-
-$(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
-        @target=$(WPTEST); $(BUILD_CMD)
-
-$(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
-        @target=$(RC2TEST); $(BUILD_CMD)
-
-$(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
-        @target=$(BFTEST); $(BUILD_CMD)
-
-$(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
-        @target=$(CASTTEST); $(BUILD_CMD)
-
-$(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
-        @target=$(RC4TEST); $(BUILD_CMD)
-
-$(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
-        @target=$(RC5TEST); $(BUILD_CMD)
-
-$(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
-        @target=$(DESTEST); $(BUILD_CMD)
-
-$(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
-        @target=$(RANDTEST); $(BUILD_CMD)
-
-$(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
-        @target=$(DHTEST); $(BUILD_CMD)
-
-$(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
-        @target=$(DSATEST); $(BUILD_CMD)
-
-$(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
-        @target=$(METHTEST); $(BUILD_CMD)
-
-$(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
-        @target=$(SSLTEST); $(FIPS_BUILD_CMD)
-
-$(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
-        @target=$(ENGINETEST); $(BUILD_CMD)
-
-$(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
-        @target=$(EVPTEST); $(BUILD_CMD)
-
-$(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
-        @target=$(ECDSATEST); $(BUILD_CMD)
-
-$(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
-        @target=$(ECDHTEST); $(BUILD_CMD)
-
-$(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
-        @target=$(IGETEST); $(BUILD_CMD)
-
-$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
-        @target=$(JPAKETEST); $(BUILD_CMD)
-
-$(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
-        @target=$(ASN1TEST); $(BUILD_CMD)
-
-$(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
-        @target=$(SRPTEST); $(BUILD_CMD)
-
-#$(AESTEST).o: $(AESTEST).c
-#       $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-
-#$(AESTEST)$(EXE_EXT): $(AESTEST).o $(DLIBCRYPTO)
-#       if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \
-#         $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \
-#       else \
-#         $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \
-#       fi
-
-dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
-        @target=dummytest; $(BUILD_CMD)
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/src/tools/Makefile b/src/lib/libssl/src/tools/Makefile
deleted file mode 100644
index bb6fb71f3e..0000000000
--- a/src/lib/libssl/src/tools/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# OpenSSL/tools/Makefile
-#
-
-DIR=    tools
-TOP=    ..
-CC=     cc
-INCLUDES= -I$(TOP) -I../../include
-CFLAG=-g
-MAKEFILE=       Makefile
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST=
-APPS= c_rehash
-MISC_APPS= c_hash c_info c_issuer c_name
-
-all:
-
-install:
-        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-        @for i in $(APPS) ; \
-        do  \
-        (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 ); \
-        done;
-        @for i in $(MISC_APPS) ; \
-        do  \
-        (cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
-        chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
-        mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
-        done;
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-
-lint:
-
-tags:
-
-errors:
-
-depend:
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-        rm -f c_rehash
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-
-errors:
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/test/Makefile b/src/lib/libssl/test/Makefile
deleted file mode 100644
index 608b7abf27..0000000000
--- a/src/lib/libssl/test/Makefile
+++ /dev/null
@@ -1,485 +0,0 @@
-#
-# test/Makefile
-#
-
-DIR=            test
-TOP=            ..
-CC=             cc
-INCLUDES=       -I$(TOP) -I../include $(KRB5_INCLUDES)
-CFLAG=          -g
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-PERL=           perl
-# KRB5 stuff
-KRB5_INCLUDES=
-LIBKRB5=
-
-PEX_LIBS=
-EX_LIBS= #-lnsl -lsocket
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile maketests.com \
-        tests.com testenc.com tx509.com trsa.com tcrl.com tsid.com treq.com \
-        tpkcs7.com tpkcs7d.com tverify.com testgen.com testss.com testssl.com \
-        testca.com VMSca-response.1 VMSca-response.2
-
-DLIBCRYPTO= ../libcrypto.a
-DLIBSSL= ../libssl.a
-LIBCRYPTO= -L.. -lcrypto
-LIBSSL= -L.. -lssl
-
-BNTEST=         bntest
-ECTEST=         ectest
-ECDSATEST=      ecdsatest
-ECDHTEST=       ecdhtest
-EXPTEST=        exptest
-IDEATEST=       ideatest
-SHATEST=        shatest
-SHA1TEST=       sha1test
-SHA256TEST=     sha256t
-SHA512TEST=     sha512t
-MDC2TEST=       mdc2test
-RMDTEST=        rmdtest
-MD2TEST=        md2test
-MD4TEST=        md4test
-MD5TEST=        md5test
-HMACTEST=       hmactest
-WPTEST=         wp_test
-RC2TEST=        rc2test
-RC4TEST=        rc4test
-RC5TEST=        rc5test
-BFTEST=         bftest
-CASTTEST=       casttest
-DESTEST=        destest
-RANDTEST=       randtest
-DHTEST=         dhtest
-DSATEST=        dsatest
-METHTEST=       methtest
-SSLTEST=        ssltest
-RSATEST=        rsa_test
-ENGINETEST=     enginetest
-EVPTEST=        evp_test
-IGETEST=        igetest
-JPAKETEST=      jpaketest
-SRPTEST=        srptest
-ASN1TEST=       asn1test
-
-TESTS=          alltests
-
-EXE=    $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT)  $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)$(EXE_EXT) $(IDEATEST)$(EXE_EXT) \
-        $(MD2TEST)$(EXE_EXT)  $(MD4TEST)$(EXE_EXT) $(MD5TEST)$(EXE_EXT) $(HMACTEST)$(EXE_EXT) $(WPTEST)$(EXE_EXT) \
-        $(RC2TEST)$(EXE_EXT) $(RC4TEST)$(EXE_EXT) $(RC5TEST)$(EXE_EXT) \
-        $(DESTEST)$(EXE_EXT) $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT) \
-        $(MDC2TEST)$(EXE_EXT) $(RMDTEST)$(EXE_EXT) \
-        $(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \
-        $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \
-        $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \
-        $(ASN1TEST)$(EXE_EXT)
-
-# $(METHTEST)$(EXE_EXT)
-
-OBJ=    $(BNTEST).o $(ECTEST).o  $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
-        $(MD2TEST).o $(MD4TEST).o $(MD5TEST).o \
-        $(HMACTEST).o $(WPTEST).o \
-        $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
-        $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(SHA256TEST).o $(SHA512TEST).o \
-        $(MDC2TEST).o $(RMDTEST).o \
-        $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \
-        $(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o $(RSATEST).o \
-        $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o
-SRC=    $(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
-        $(MD2TEST).c  $(MD4TEST).c $(MD5TEST).c \
-        $(HMACTEST).c $(WPTEST).c \
-        $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
-        $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
-        $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \
-        $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c $(RSATEST).c \
-        $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c
-
-EXHEADER= 
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd ..; $(MAKE) DIRS=$(DIR) TESTS=$(TESTS) all)
-
-all:    exe
-
-exe:    $(EXE) dummytest$(EXE_EXT)
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-
-generate: $(SRC)
-$(SRC):
-        @sh $(TOP)/util/point.sh dummytest.c $@
-
-errors:
-
-install:
-
-tags:
-        ctags $(SRC)
-
-tests:  exe apps $(TESTS)
-
-apps:
-        @(cd ..; $(MAKE) DIRS=apps all)
-
-alltests: \
-        test_des test_idea test_sha test_md4 test_md5 test_hmac \
-        test_md2 test_mdc2 test_wp \
-        test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \
-        test_rand test_bn test_ec test_ecdsa test_ecdh \
-        test_enc test_x509 test_rsa test_crl test_sid \
-        test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
-        test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \
-        test_jpake test_srp test_cms
-
-test_evp:
-        ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
-
-test_des:
-        ../util/shlib_wrap.sh ./$(DESTEST)
-
-test_idea:
-        ../util/shlib_wrap.sh ./$(IDEATEST)
-
-test_sha:
-        ../util/shlib_wrap.sh ./$(SHATEST)
-        ../util/shlib_wrap.sh ./$(SHA1TEST)
-        ../util/shlib_wrap.sh ./$(SHA256TEST)
-        ../util/shlib_wrap.sh ./$(SHA512TEST)
-
-test_mdc2:
-        ../util/shlib_wrap.sh ./$(MDC2TEST)
-
-test_md5:
-        ../util/shlib_wrap.sh ./$(MD5TEST)
-
-test_md4:
-        ../util/shlib_wrap.sh ./$(MD4TEST)
-
-test_hmac:
-        ../util/shlib_wrap.sh ./$(HMACTEST)
-
-test_wp:
-        ../util/shlib_wrap.sh ./$(WPTEST)
-
-test_md2:
-        ../util/shlib_wrap.sh ./$(MD2TEST)
-
-test_rmd:
-        ../util/shlib_wrap.sh ./$(RMDTEST)
-
-test_bf:
-        ../util/shlib_wrap.sh ./$(BFTEST)
-
-test_cast:
-        ../util/shlib_wrap.sh ./$(CASTTEST)
-
-test_rc2:
-        ../util/shlib_wrap.sh ./$(RC2TEST)
-
-test_rc4:
-        ../util/shlib_wrap.sh ./$(RC4TEST)
-
-test_rc5:
-        ../util/shlib_wrap.sh ./$(RC5TEST)
-
-test_rand:
-        ../util/shlib_wrap.sh ./$(RANDTEST)
-
-test_enc:
-        @sh ./testenc
-
-test_x509:
-        echo test normal x509v1 certificate
-        sh ./tx509 2>/dev/null
-        echo test first x509v3 certificate
-        sh ./tx509 v3-cert1.pem 2>/dev/null
-        echo test second x509v3 certificate
-        sh ./tx509 v3-cert2.pem 2>/dev/null
-
-test_rsa: $(RSATEST)$(EXE_EXT)
-        @sh ./trsa 2>/dev/null
-        ../util/shlib_wrap.sh ./$(RSATEST)
-
-test_crl:
-        @sh ./tcrl 2>/dev/null
-
-test_sid:
-        @sh ./tsid 2>/dev/null
-
-test_req:
-        @sh ./treq 2>/dev/null
-        @sh ./treq testreq2.pem 2>/dev/null
-
-test_pkcs7:
-        @sh ./tpkcs7 2>/dev/null
-        @sh ./tpkcs7d 2>/dev/null
-
-test_bn:
-        @echo starting big number library test, could take a while...
-        @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
-        @echo quit >>tmp.bntest
-        @echo "running bc"
-        @<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
-        @echo 'test a^b%c implementations'
-        ../util/shlib_wrap.sh ./$(EXPTEST)
-
-test_ec:
-        @echo 'test elliptic curves'
-        ../util/shlib_wrap.sh ./$(ECTEST)
-
-test_ecdsa:
-        @echo 'test ecdsa'
-        ../util/shlib_wrap.sh ./$(ECDSATEST)
-
-test_ecdh:
-        @echo 'test ecdh'
-        ../util/shlib_wrap.sh ./$(ECDHTEST)
-
-test_verify:
-        @echo "The following command should have some OK's and some failures"
-        @echo "There are definitly a few expired certificates"
-        ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
-
-test_dh:
-        @echo "Generate a set of DH parameters"
-        ../util/shlib_wrap.sh ./$(DHTEST)
-
-test_dsa:
-        @echo "Generate a set of DSA parameters"
-        ../util/shlib_wrap.sh ./$(DSATEST)
-        ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
-
-test_gen:
-        @echo "Generate and verify a certificate request"
-        @sh ./testgen
-
-test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
-                intP1.ss intP2.ss: testss
-        @echo "Generate and certify a test certificate"
-        @sh ./testss
-        @cat certCA.ss certU.ss > intP1.ss
-        @cat certCA.ss certU.ss certP1.ss > intP2.ss
-
-test_engine: 
-        @echo "Manipulate the ENGINE structures"
-        ../util/shlib_wrap.sh ./$(ENGINETEST)
-
-test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
-                intP1.ss intP2.ss
-        @echo "test SSL protocol"
-        @if [ -n "$(FIPSCANLIB)" ]; then \
-          sh ./testfipsssl keyU.ss certU.ss certCA.ss; \
-        fi
-        ../util/shlib_wrap.sh ./$(SSLTEST) -test_cipherlist
-        @sh ./testssl keyU.ss certU.ss certCA.ss
-        @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
-        @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
-
-test_ca:
-        @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
-          echo "skipping CA.sh test -- requires RSA"; \
-        else \
-          echo "Generate and certify a test certificate via the 'ca' program"; \
-          sh ./testca; \
-        fi
-
-test_aes: #$(AESTEST)
-#       @echo "test Rijndael"
-#       ../util/shlib_wrap.sh ./$(AESTEST)
-
-test_tsa:
-        @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
-          echo "skipping testtsa test -- requires RSA"; \
-        else \
-          sh ./testtsa; \
-        fi
-
-test_ige: $(IGETEST)$(EXE_EXT)
-        @echo "Test IGE mode"
-        ../util/shlib_wrap.sh ./$(IGETEST)
-
-test_jpake: $(JPAKETEST)$(EXE_EXT)
-        @echo "Test JPAKE"
-        ../util/shlib_wrap.sh ./$(JPAKETEST)
-
-test_cms:
-        @echo "CMS consistency test"
-        $(PERL) cms-test.pl
-
-test_srp: $(SRPTEST)$(EXE_EXT)
-        @echo "Test SRP"
-        ../util/shlib_wrap.sh ./srptest
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        @if [ -z "$(THIS)" ]; then \
-            $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
-        else \
-            $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
-        fi
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-        rm -f $(SRC) $(SHA256TEST).c $(SHA512TEST).c evptests.txt newkey.pem testkey.pem \
-                        testreq.pem
-
-clean:
-        rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest
-
-$(DLIBSSL):
-        (cd ..; $(MAKE) DIRS=ssl all)
-
-$(DLIBCRYPTO):
-        (cd ..; $(MAKE) DIRS=crypto all)
-
-BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
-                shlib_target="$(SHLIB_TARGET)"; \
-        fi; \
-        LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
-        $(MAKE) -f $(TOP)/Makefile.shared -e \
-                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
-                link_app.$${shlib_target}
-
-FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
-                shlib_target="$(SHLIB_TARGET)"; \
-        fi; \
-        LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
-        if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
-                FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
-        fi; \
-        $(MAKE) -f $(TOP)/Makefile.shared -e \
-                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
-                link_app.$${shlib_target}
-
-$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
-        @target=$(RSATEST); $(BUILD_CMD)
-
-$(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
-        @target=$(BNTEST); $(BUILD_CMD)
-
-$(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
-        @target=$(ECTEST); $(BUILD_CMD)
-
-$(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
-        @target=$(EXPTEST); $(BUILD_CMD)
-
-$(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
-        @target=$(IDEATEST); $(BUILD_CMD)
-
-$(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
-        @target=$(MD2TEST); $(BUILD_CMD)
-
-$(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
-        @target=$(SHATEST); $(BUILD_CMD)
-
-$(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
-        @target=$(SHA1TEST); $(BUILD_CMD)
-
-$(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
-        @target=$(SHA256TEST); $(BUILD_CMD)
-
-$(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
-        @target=$(SHA512TEST); $(BUILD_CMD)
-
-$(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
-        @target=$(RMDTEST); $(BUILD_CMD)
-
-$(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
-        @target=$(MDC2TEST); $(BUILD_CMD)
-
-$(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
-        @target=$(MD4TEST); $(BUILD_CMD)
-
-$(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
-        @target=$(MD5TEST); $(BUILD_CMD)
-
-$(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
-        @target=$(HMACTEST); $(BUILD_CMD)
-
-$(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
-        @target=$(WPTEST); $(BUILD_CMD)
-
-$(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
-        @target=$(RC2TEST); $(BUILD_CMD)
-
-$(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
-        @target=$(BFTEST); $(BUILD_CMD)
-
-$(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
-        @target=$(CASTTEST); $(BUILD_CMD)
-
-$(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
-        @target=$(RC4TEST); $(BUILD_CMD)
-
-$(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
-        @target=$(RC5TEST); $(BUILD_CMD)
-
-$(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
-        @target=$(DESTEST); $(BUILD_CMD)
-
-$(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
-        @target=$(RANDTEST); $(BUILD_CMD)
-
-$(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
-        @target=$(DHTEST); $(BUILD_CMD)
-
-$(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
-        @target=$(DSATEST); $(BUILD_CMD)
-
-$(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
-        @target=$(METHTEST); $(BUILD_CMD)
-
-$(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
-        @target=$(SSLTEST); $(FIPS_BUILD_CMD)
-
-$(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
-        @target=$(ENGINETEST); $(BUILD_CMD)
-
-$(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
-        @target=$(EVPTEST); $(BUILD_CMD)
-
-$(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
-        @target=$(ECDSATEST); $(BUILD_CMD)
-
-$(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
-        @target=$(ECDHTEST); $(BUILD_CMD)
-
-$(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
-        @target=$(IGETEST); $(BUILD_CMD)
-
-$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
-        @target=$(JPAKETEST); $(BUILD_CMD)
-
-$(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
-        @target=$(ASN1TEST); $(BUILD_CMD)
-
-$(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
-        @target=$(SRPTEST); $(BUILD_CMD)
-
-#$(AESTEST).o: $(AESTEST).c
-#       $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-
-#$(AESTEST)$(EXE_EXT): $(AESTEST).o $(DLIBCRYPTO)
-#       if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \
-#         $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \
-#       else \
-#         $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \
-#       fi
-
-dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
-        @target=dummytest; $(BUILD_CMD)
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.