Commit 007c80ea authored by Richard Levitte's avatar Richard Levitte
Browse files

Remove the remainder of util/mk1mf.pl and companion scripts 



This removes all scripts that deal with MINFO as well, since that's
only used by mk1mf.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 0ef1ce49

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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]

Configure

+0 −6
Original line number Diff line number Diff line
@@ -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);

Makefile.in

+1 −9
Original line number Diff line number Diff line
@@ -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..." && \

apps/Makefile.in

+0 −3
Original line number Diff line number Diff line
@@ -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); \

crypto/Makefile.in

+0 −4
Original line number Diff line number Diff line
@@ -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