Zero is a valid value for any_skip and map_skip

[oweals/openssl.git] / crypto / des / Makefile

diff --git a/crypto/des/Makefile b/crypto/des/Makefile
index 38409ca6d1424f5af5eefa8891a4a842ec7d03d7..ae982265fde004769472492c4a2df4f502112003 100644 (file)
--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@@ -12,8 +12,6 @@ MAKEFILE=     Makefile
 AR=            ar r
 RANLIB=                ranlib
 DES_ENC=       des_enc.o fcrypt_b.o
-# or use
-#DES_ENC=      dx86-elf.o yx86-elf.o
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 ASFLAGS= $(INCLUDES) $(ASFLAG)
@@ -64,21 +62,10 @@ des: des.o cbc3_enc.o lib
 des_enc-sparc.S:       asm/des_enc.m4
        m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
 
-# ELF
-dx86-elf.s:    asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
-       (cd asm; $(PERL) des-586.pl elf $(CFLAGS) > ../$@)
-yx86-elf.s:    asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
-       (cd asm; $(PERL) crypt586.pl elf $(CFLAGS) > ../$@)
-# COFF
-dx86-cof.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
-       (cd asm; $(PERL) des-586.pl coff $(CFLAGS) > ../$@)
-yx86-cof.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
-       (cd asm; $(PERL) crypt586.pl coff $(CFLAGS) > ../$@)
-# a.out
-dx86-out.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
-       (cd asm; $(PERL) des-586.pl a.out $(CFLAGS) > ../$@)
-yx86-out.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
-       (cd asm; $(PERL) crypt586.pl a.out $(CFLAGS) > ../$@)
+des-586.s:     asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+       $(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
+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