Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>, Michael Tuexen <tuexen...

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

diff --git a/crypto/whrlpool/Makefile b/crypto/whrlpool/Makefile
index a0b07df53a033de5a0d164a6939c943583f2d335..566b996290511e98111834ee811775dd8de1b43c 100644 (file)
--- a/crypto/whrlpool/Makefile
+++ b/crypto/whrlpool/Makefile
@@ -11,6 +11,8 @@ CFLAG=-g
 MAKEFILE=      Makefile
 AR=            ar r
 
+WP_ASM_OBJ=wp_block.o
+
 CFLAGS= $(INCLUDES) $(CFLAG)
 ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
@@ -21,7 +23,7 @@ APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC=wp_dgst.c wp_block.c
-LIBOBJ=wp_dgst.o wp_block.o $(WP_ASM_OBJ)
+LIBOBJ=wp_dgst.o $(WP_ASM_OBJ)
 
 SRC= $(LIBSRC)
 
@@ -40,15 +42,11 @@ lib:        $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
-w86mmx-elf.s: asm/wp-mmx.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) wp-mmx.pl elf $(CFLAGS) $(PROCESSOR)) > $@
-w86mmx-cof.s: asm/wp-mmx.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) wp-mmx.pl coff $(CFLAGS) $(PROCESSOR)) > $@
-w86mmx-out.s: asm/wp-mmx.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) wp-mmx.pl a.out $(CFLAGS) $(PROCESSOR)) > $@
+wp-mmx.s:      asm/wp-mmx.pl ../perlasm/x86asm.pl
+       $(PERL) asm/wp-mmx.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
 wp-x86_64.s: asm/wp-x86_64.pl
-       $(PERL) asm/wp-x86_64.pl $@
+       $(PERL) asm/wp-x86_64.pl $(PERLASM_SCHEME) > $@
 
 $(LIBOBJ): $(LIBSRC)