crypto/rc5/Makefile was erroneously omitted from last perlasm unification.

Also remove obsolete and now misleading comments.

diff --git a/crypto/bf/Makefile b/crypto/bf/Makefile
index 9525a0bc35568c1866a551e46642329b7e81444a..dd2c2c708e63fd1295e081d1b5797bfb10895f9a 100644 (file)
--- a/crypto/bf/Makefile
+++ b/crypto/bf/Makefile
@@ -12,8 +12,6 @@ MAKEFILE=     Makefile
 AR=            ar r
 
 BF_ENC=                bf_enc.o
-# or use
-#DES_ENC=      bx86-elf.o
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 ASFLAGS= $(INCLUDES) $(ASFLAG)

diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index d3799ba2a6669e271ce6f7d635a2e3fef40be541..86fb707ec296221012de675ae39d9a9dfae48f2d 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -12,8 +12,6 @@ MAKEFILE=     Makefile
 AR=            ar r
 
 BN_ASM=                bn_asm.o
-# or use
-#BN_ASM=       bn86-elf.o
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 ASFLAGS= $(INCLUDES) $(ASFLAG)

diff --git a/crypto/des/Makefile b/crypto/des/Makefile
index 81dbf0e3ef8ff1c3f8c74c41087168c3087fe494..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)

diff --git a/crypto/rc5/Makefile b/crypto/rc5/Makefile
index efb0f36b598094bbecaa5bc96cab04baa34076a7..8a8b00eb89e6038b912ff722dd8a56713e5f82e8 100644 (file)
--- a/crypto/rc5/Makefile
+++ b/crypto/rc5/Makefile
@@ -12,8 +12,6 @@ MAKEFILE=     Makefile
 AR=            ar r
 
 RC5_ENC=               rc5_enc.o
-# or use
-#DES_ENC=      r586-elf.o
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 ASFLAGS= $(INCLUDES) $(ASFLAG)
@@ -44,15 +42,8 @@ lib: $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
-# ELF
-r586-elf.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
-       (cd asm; $(PERL) rc5-586.pl elf $(CFLAGS) > ../$@)
-# COFF
-r586-cof.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
-       (cd asm; $(PERL) rc5-586.pl coff $(CFLAGS) > ../$@)
-# a.out
-r586-out.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
-       (cd asm; $(PERL) rc5-586.pl a.out $(CFLAGS) > ../$@)
+rc5-586.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+       $(PERL) asm/rc5-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
 
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO