diff options
71 files changed, 4 insertions, 2296 deletions
@@ -4,6 +4,9 @@ Changes between 1.0.2g and 1.1.0 [xx XXX xxxx] + *) Removed the mk1mf build scripts. + [Richard Levitte] + *) Headers are now wrapped, if necessary, with OPENSSL_NO_xxx, so it is always safe to #include a header now. [Rich Salz] @@ -1778,7 +1778,6 @@ print OUT "1;\n"; close(OUT); -print "IsMK1MF =", ($builder eq "mk1mf" ? "yes" : "no"), "\n"; print "CC =$target{cc}\n"; print "CFLAG =$target{cflags} $config{cflags}\n"; print "SHARED_CFLAG =$target{shared_cflag}\n"; @@ -1870,11 +1869,6 @@ my %builders = ( run_dofile("util/domd", "util/domd.in"); chmod 0755, "util/domd"; }, - mk1mf => sub { - my $platform = shift; - # The only reason we do this is to have something to build MINFO from - build_Makefile(); - }, ); $builders{$builder}->($builder_platform, @builder_opts); diff --git a/Makefile.in b/Makefile.in index d101df1ca8..baaaf84432 100644 --- a/Makefile.in +++ b/Makefile.in @@ -465,19 +465,11 @@ clean: libclean rm -f speed.* .pure rm -f $(TARFILE) -makefile.one: files - $(PERL) util/mk1mf.pl >makefile.one; \ - sh util/do_ms.sh - -files: - $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO - @set -e; target=files; $(RECURSIVE_BUILD_CMD) - gentests: @(cd test && echo "generating dummy tests (if needed)..." && \ $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate ); -test: files tests +test: tests tests: build_tests @(cd test && echo "testing..." && \ diff --git a/apps/Makefile.in b/apps/Makefile.in index 6e8bdf5882..064496b6d4 100644 --- a/apps/Makefile.in +++ b/apps/Makefile.in @@ -75,9 +75,6 @@ scripts: $(SCRIPTS) openssl-vms.cnf: openssl.cnf $(PERL) $(TOP)/VMS/VMSify-conf.pl < openssl.cnf > openssl-vms.cnf -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - install: @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @set -e; for i in $(EXE); \ diff --git a/crypto/Makefile.in b/crypto/Makefile.in index 9f26ef007a..60304acbc2 100644 --- a/crypto/Makefile.in +++ b/crypto/Makefile.in @@ -89,10 +89,6 @@ armv4cpuid.S: armv4cpuid.pl; $(PERL) armv4cpuid.pl $(PERLASM_SCHEME) $@ subdirs: @target=all; $(RECURSIVE_MAKE) -files: - $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO - @target=files; $(RECURSIVE_MAKE) - # lib: $(LIB): are splitted to avoid end-less loop lib: $(LIB) @touch lib diff --git a/crypto/aes/Makefile.in b/crypto/aes/Makefile.in index 46566c3608..0dc96e4a3d 100644 --- a/crypto/aes/Makefile.in +++ b/crypto/aes/Makefile.in @@ -97,9 +97,6 @@ aes-armv4.o: aes-armv4.S bsaes-%.S: asm/bsaes-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ bsaes-armv7.o: bsaes-armv7.S -files: - $(PERL) $(TOP)/util/files.pl "AES_ENC=$(AES_ENC)" Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/asn1/Makefile.in b/crypto/asn1/Makefile.in index 86f805bc6f..fd8ffcfd99 100644 --- a/crypto/asn1/Makefile.in +++ b/crypto/asn1/Makefile.in @@ -68,9 +68,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/async/Makefile.in b/crypto/async/Makefile.in index 97b5385c08..aa85749899 100644 --- a/crypto/async/Makefile.in +++ b/crypto/async/Makefile.in @@ -36,9 +36,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - links: @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) diff --git a/crypto/bf/Makefile.in b/crypto/bf/Makefile.in index 4a3d726e5d..a41b9d1969 100644 --- a/crypto/bf/Makefile.in +++ b/crypto/bf/Makefile.in @@ -42,9 +42,6 @@ lib: $(LIBOBJ) bf-586.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl $(PERL) asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@ -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/bio/Makefile.in b/crypto/bio/Makefile.in index 2bf8601ee8..12cf6c6792 100644 --- a/crypto/bio/Makefile.in +++ b/crypto/bio/Makefile.in @@ -46,9 +46,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/blake2/Makefile.in b/crypto/blake2/Makefile.in index 452d1ea1e0..ebfaa045b2 100644 --- a/crypto/blake2/Makefile.in +++ b/crypto/blake2/Makefile.in @@ -30,9 +30,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - update: depend depend: diff --git a/crypto/bn/Makefile.in b/crypto/bn/Makefile.in index eb610e715c..420eebbc87 100644 --- a/crypto/bn/Makefile.in +++ b/crypto/bn/Makefile.in @@ -130,9 +130,6 @@ armv4-mont.o: armv4-mont.S armv4-gf2m.o: armv4-gf2m.S armv8-mont.o: armv8-mont.S -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - div: rm -f a.out gcc -I.. -g div.c ../../libcrypto.a diff --git a/crypto/buffer/Makefile.in b/crypto/buffer/Makefile.in index 09b3488f04..97e1094ddb 100644 --- a/crypto/buffer/Makefile.in +++ b/crypto/buffer/Makefile.in @@ -34,9 +34,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/camellia/Makefile.in b/crypto/camellia/Makefile.in index cb62c91cb3..5a806e26fd 100644 --- a/crypto/camellia/Makefile.in +++ b/crypto/camellia/Makefile.in @@ -48,9 +48,6 @@ cmll-x86_64.s: asm/cmll-x86_64.pl cmllt4-sparcv9.S: asm/cmllt4-sparcv9.pl ../perlasm/sparcv9_modes.pl $(PERL) asm/cmllt4-sparcv9.pl $(PERLASM_SCHEME) $@ -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/cast/Makefile.in b/crypto/cast/Makefile.in index f1ad0c7f3e..218c480d1a 100644 --- a/crypto/cast/Makefile.in +++ b/crypto/cast/Makefile.in @@ -42,9 +42,6 @@ lib: $(LIBOBJ) cast-586.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl $(PERL) asm/cast-586.pl $(PERLASM_SCHEME) $(CLAGS) $(PROCESSOR) $@ -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/chacha/Makefile.in b/crypto/chacha/Makefile.in index e728b4d93b..067fbed428 100644 --- a/crypto/chacha/Makefile.in +++ b/crypto/chacha/Makefile.in @@ -48,9 +48,6 @@ chacha-%.S: asm/chacha-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ chacha-armv4.o: chacha-armv4.S chacha-armv8.o: chacha-armv8.S -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/cmac/Makefile.in b/crypto/cmac/Makefile.in index 5abc139068..1d6f0bd52c 100644 --- a/crypto/cmac/Makefile.in +++ b/crypto/cmac/Makefile.in @@ -34,9 +34,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/cms/Makefile.in b/crypto/cms/Makefile.in index cf074eaa81..19a50b21e7 100644 --- a/crypto/cms/Makefile.in +++ b/crypto/cms/Makefile.in @@ -40,9 +40,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/comp/Makefile.in b/crypto/comp/Makefile.in index 24c1231fcc..0673d469d9 100644 --- a/crypto/comp/Makefile.in +++ b/crypto/comp/Makefile.in @@ -37,9 +37,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(LIBSRC) diff --git a/crypto/conf/Makefile.in b/crypto/conf/Makefile.in index e1bae369c2..5acaa1c403 100644 --- a/crypto/conf/Makefile.in +++ b/crypto/conf/Makefile.in @@ -37,9 +37,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(LIBSRC) diff --git a/crypto/ct/Makefile.in b/crypto/ct/Makefile.in index 0daec36544..794efbc6d7 100644 --- a/crypto/ct/Makefile.in +++ b/crypto/ct/Makefile.in @@ -36,9 +36,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/des/Makefile.in b/crypto/des/Makefile.in index 74c5862ab2..5f87f22bf7 100644 --- a/crypto/des/Makefile.in +++ b/crypto/des/Makefile.in @@ -63,9 +63,6 @@ des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl crypt586.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl $(PERL) asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS) $@ -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/dh/Makefile.in b/crypto/dh/Makefile.in index 9ac52eb1b4..fa2d769691 100644 --- a/crypto/dh/Makefile.in +++ b/crypto/dh/Makefile.in @@ -36,9 +36,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/dsa/Makefile.in b/crypto/dsa/Makefile.in index a22dfa32b5..9f38d4eef5 100644 --- a/crypto/dsa/Makefile.in +++ b/crypto/dsa/Makefile.in @@ -36,9 +36,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/dso/Makefile.in b/crypto/dso/Makefile.in index 58d0974507..8c517febce 100644 --- a/crypto/dso/Makefile.in +++ b/crypto/dso/Makefile.in @@ -36,9 +36,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/ec/Makefile.in b/crypto/ec/Makefile.in index 4203b70f2e..cc5e4b671f 100644 --- a/crypto/ec/Makefile.in +++ b/crypto/ec/Makefile.in @@ -64,9 +64,6 @@ ecp_nistz256-%.S: asm/ecp_nistz256-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ ecp_nistz256-armv4.o: ecp_nistz256-armv4.S ecp_nistz256-armv8.o: ecp_nistz256-armv8.S -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/engine/Makefile.in b/crypto/engine/Makefile.in index 8435e7576c..9f4edc6a4c 100644 --- a/crypto/engine/Makefile.in +++ b/crypto/engine/Makefile.in @@ -44,9 +44,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/err/Makefile.in b/crypto/err/Makefile.in index f0051e8546..c12ea3ffd8 100644 --- a/crypto/err/Makefile.in +++ b/crypto/err/Makefile.in @@ -34,9 +34,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/evp/Makefile.in b/crypto/evp/Makefile.in index 5b24ae5909..15080d018c 100644 --- a/crypto/evp/Makefile.in +++ b/crypto/evp/Makefile.in @@ -59,9 +59,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(LIBSRC) diff --git a/crypto/hmac/Makefile.in b/crypto/hmac/Makefile.in index ab8acab143..2da801ccda 100644 --- a/crypto/hmac/Makefile.in +++ b/crypto/hmac/Makefile.in @@ -34,9 +34,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) diff --git a/crypto/idea/Makefile.in b/crypto/idea/Makefile.in index b3aafcad79..61ab62b713 100644 --- a/crypto/idea/Makefile.in +++ b/crypto/idea/Makefile.in @@ -34,9 +34,6 @@ lib: $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC) |