This patch was "ignited" by OpenBSD 3>=4 support. They've switched to ELF

and GNU binutils, but kept BSD make... And I took the opportunity to
unify other targets to this common least denominator...

10 files changed, 64 insertions, 74 deletions

diff --git a/crypto/aes/Makefile.ssl b/crypto/aes/Makefile.ssl
index 10b99712d6..7f7f141b44 100644
--- a/crypto/aes/Makefile.ssl
+++ b/crypto/aes/Makefile.ssl
@@ -51,12 +51,12 @@ lib:	$(LIBOBJ)
 
 $(LIBOBJ): $(LIBSRC)
 
-asm/aes-ia64.s: asm/aes-ia64.S
+aes-ia64.s: asm/aes-ia64.S
 	$(CC) $(CFLAGS) -E asm/aes-ia64.S > $@
 
-asm/ax86-elf.s: asm/aes-586.pl ../perlasm/x86asm.pl
+ax86-elf.s: asm/aes-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) aes-586.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
-asm/ax86-cof.s: asm/aes-586.pl ../perlasm/x86asm.pl
+ax86-cof.s: asm/aes-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) aes-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
 ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
@@ -95,7 +95,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/*.[so] *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/crypto/bf/Makefile.ssl b/crypto/bf/Makefile.ssl
index 241381e9cc..89894dd035 100644
--- a/crypto/bf/Makefile.ssl
+++ b/crypto/bf/Makefile.ssl
@@ -51,10 +51,10 @@ lib:	$(LIBOBJ)
 	@touch lib
 
 # ELF
-asm/bx86-elf.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+bx86-elf.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) bf-586.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
 # COFF
-asm/bx86-cof.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+bx86-cof.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) bf-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
 # a.out
 bx86-out.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
@@ -94,7 +94,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/bx86unix.cpp asm/*.s asm/*.o *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl
index 08cdd92c46..817bfa54cd 100644
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -69,14 +69,14 @@ lib:	$(LIBOBJ)
 	@touch lib
 
 # ELF
-asm/bn86-elf.s:	asm/bn-586.pl ../perlasm/x86asm.pl
+bn86-elf.s:	asm/bn-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) bn-586.pl elf $(CFLAGS) > ../$@)
-asm/co86-elf.s:	asm/co-586.pl ../perlasm/x86asm.pl
+co86-elf.s:	asm/co-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) co-586.pl elf $(CFLAGS) > ../$@)
 # COFF
-asm/bn86-cof.s: asm/bn-586.pl ../perlasm/x86asm.pl
+bn86-cof.s: asm/bn-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) bn-586.pl coff $(CFLAGS) > ../$@)
-asm/co86-cof.s: asm/co-586.pl ../perlasm/x86asm.pl
+co86-cof.s: asm/co-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) co-586.pl coff $(CFLAGS) > ../$@)
 # a.out
 bn86-out.s: asm/bn-586.pl ../perlasm/x86asm.pl
@@ -84,28 +84,28 @@ bn86-out.s: asm/bn-586.pl ../perlasm/x86asm.pl
 co86-out.s: asm/co-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) co-586.pl a.out $(CFLAGS) > ../$@)
 
-asm/sparcv8.o: asm/sparcv8.S
+sparcv8.o:	asm/sparcv8.S
+sparcv8plus.o:	asm/sparcv8plus.S
+mips3.o:	asm/mips3.s
 
-asm/sparcv8plus.o: asm/sparcv8plus.S
+x86_64-gcc.o:	asm/x86_64-gcc.c
 
-asm/ia64.s:	asm/ia64.S
+bn-ia64.s:	asm/ia64.S
 	$(CC) $(CFLAGS) -E asm/ia64.S > $@
 
-asm/x86_64-gcc.o: asm/x86_64-gcc.c
-
 # GNU assembler fails to compile PA-RISC2 modules, insist on calling
 # vendor assembler...
-asm/pa-risc2W.o: asm/pa-risc2W.s
-	/usr/ccs/bin/as -o asm/pa-risc2W.o asm/pa-risc2W.s
-asm/pa-risc2.o: asm/pa-risc2.s
-	/usr/ccs/bin/as -o asm/pa-risc2.o asm/pa-risc2.s
+pa-risc2W.o: asm/pa-risc2W.s
+	/usr/ccs/bin/as -o pa-risc2W.o asm/pa-risc2W.s
+pa-risc2.o: asm/pa-risc2.s
+	/usr/ccs/bin/as -o pa-risc2.o asm/pa-risc2.s
 
 # ppc - AIX, Linux, MacOS X...
-asm/linux_ppc32.s: asm/ppc.pl;	$(PERL) $< $@
-asm/linux_ppc64.s: asm/ppc.pl;	$(PERL) $< $@
-asm/aix_ppc32.s: asm/ppc.pl;	$(PERL) asm/ppc.pl $@
-asm/aix_ppc64.s: asm/ppc.pl;	$(PERL) asm/ppc.pl $@
-asm/osx_ppc32.s: asm/ppc.pl;	$(PERL) $< $@
+linux_ppc32.s: asm/ppc.pl;	$(PERL) $< $@
+linux_ppc64.s: asm/ppc.pl;	$(PERL) $< $@
+aix_ppc32.s: asm/ppc.pl;	$(PERL) asm/ppc.pl $@
+aix_ppc64.s: asm/ppc.pl;	$(PERL) asm/ppc.pl $@
+osx_ppc32.s: asm/ppc.pl;	$(PERL) $< $@
 
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
@@ -147,7 +147,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/co86unix.cpp asm/bn86unix.cpp asm/*-elf.* asm/*-cof.* asm/*-out.* asm/ia64.s *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl
index 6a2aba2d78..5ff5b7a715 100644
--- a/crypto/cast/Makefile.ssl
+++ b/crypto/cast/Makefile.ssl
@@ -18,11 +18,6 @@ MAKEFILE=	Makefile.ssl
 AR=		ar r
 
 CAST_ENC=c_enc.o
-# or use
-#CAST_ENC=asm/cx86-elf.o
-#CAST_ENC=asm/cx86-out.o
-#CAST_ENC=asm/cx86-sol.o
-#CAST_ENC=asm/cx86bdsi.o
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 ASFLAGS= $(INCLUDES) $(ASFLAG)
@@ -54,10 +49,10 @@ lib:	$(LIBOBJ)
 	@touch lib
 
 # ELF
-asm/cx86-elf.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+cx86-elf.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) cast-586.pl elf $(CLAGS) $(PROCESSOR) > ../$@)
 # COFF
-asm/cx86-cof.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+cx86-cof.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) cast-586.pl coff $(CLAGS) $(PROCESSOR) > ../$@)
 # a.out
 cx86-out.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
@@ -95,7 +90,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/cx86unix.cpp asm/*.s asm/*.o *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index a7e3cb586b..a0c1baa8ab 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -67,18 +67,18 @@ lib:	$(LIBOBJ)
 des: des.o cbc3_enc.o lib
 	$(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)
 
-asm/des_enc-sparc.S:	asm/des_enc.m4
-	m4 -B 8192 asm/des_enc.m4 > asm/des_enc-sparc.S
+des_enc-sparc.S:	asm/des_enc.m4
+	m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
 
 # ELF
-asm/dx86-elf.s:	asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+dx86-elf.s:	asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) des-586.pl elf $(CFLAGS) > ../$@)
-asm/yx86-elf.s:	asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+yx86-elf.s:	asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) crypt586.pl elf $(CFLAGS) > ../$@)
 # COFF
-asm/dx86-cof.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+dx86-cof.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) des-586.pl coff $(CFLAGS) > ../$@)
-asm/yx86-cof.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+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
@@ -120,7 +120,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/dx86unix.cpp asm/yx86unix.cpp asm/*.s asm/*.o *.s *.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/crypto/md5/Makefile.ssl b/crypto/md5/Makefile.ssl
index 032760d54a..5d1a29f6ab 100644
--- a/crypto/md5/Makefile.ssl
+++ b/crypto/md5/Makefile.ssl
@@ -49,18 +49,18 @@ lib:    $(LIBOBJ)
 	@touch lib
 
 # ELF
-asm/mx86-elf.s: asm/md5-586.pl ../perlasm/x86asm.pl
+mx86-elf.s: asm/md5-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) md5-586.pl elf $(CFLAGS) > ../$@)
 # COFF
-asm/mx86-cof.s: asm/md5-586.pl ../perlasm/x86asm.pl
+mx86-cof.s: asm/md5-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) md5-586.pl coff $(CFLAGS) > ../$@)
 # a.out
 mx86-out.s: asm/md5-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) md5-586.pl a.out $(CFLAGS) > ../$@)
 
-asm/md5-sparcv8plus.o: asm/md5-sparcv9.S
+md5-sparcv8plus.o: asm/md5-sparcv9.S
 	$(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -c \
-		-o asm/md5-sparcv8plus.o asm/md5-sparcv9.S
+		-o md5-sparcv8plus.o asm/md5-sparcv9.S
 
 # Old GNU assembler doesn't understand V9 instructions, so we
 # hire /usr/ccs/bin/as to do the job. Note that option is called
@@ -68,13 +68,13 @@ asm/md5-sparcv8plus.o: asm/md5-sparcv9.S
 # if they didn't bother to upgrade GNU assembler. Such users should
 # not choose this option, but be adviced to *remove* GNU assembler
 # or upgrade it.
-asm/md5-sparcv8plus-gcc27.o: asm/md5-sparcv9.S
+md5-sparcv8plus-gcc27.o: asm/md5-sparcv9.S
 	$(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -E asm/md5-sparcv9.S | \
-		/usr/ccs/bin/as -xarch=v8plus - -o asm/md5-sparcv8plus-gcc27.o
+		/usr/ccs/bin/as -xarch=v8plus - -o md5-sparcv8plus-gcc27.o
 
-asm/md5-sparcv9.o: asm/md5-sparcv9.S
+md5-sparcv9.o: asm/md5-sparcv9.S
 	$(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -c \
-		-o asm/md5-sparcv9.o asm/md5-sparcv9.S
+		-o md5-sparcv9.o asm/md5-sparcv9.S
 
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
@@ -108,7 +108,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/mx86unix.cpp asm/*.s asm/*.o *.s *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/crypto/rc4/Makefile.ssl b/crypto/rc4/Makefile.ssl
index dd0652cfba..7e98de885a 100644
--- a/crypto/rc4/Makefile.ssl
+++ b/crypto/rc4/Makefile.ssl
@@ -18,11 +18,6 @@ MAKEFILE=	Makefile.ssl
 AR=		ar r
 
 RC4_ENC=rc4_enc.o
-# or use
-#RC4_ENC=asm/rx86-elf.o
-#RC4_ENC=asm/rx86-out.o
-#RC4_ENC=asm/rx86-sol.o
-#RC4_ENC=asm/rx86bdsi.o
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 ASFLAGS= $(INCLUDES) $(ASFLAG)
@@ -54,18 +49,18 @@ lib:	$(LIBOBJ)
 	@touch lib
 
 # ELF
-asm/rx86-elf.s: asm/rc4-586.pl ../perlasm/x86asm.pl
+rx86-elf.s: asm/rc4-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) rc4-586.pl elf $(CFLAGS) > ../$@)
 # COFF
-asm/rx86-cof.s: asm/rc4-586.pl ../perlasm/x86asm.pl
+rx86-cof.s: asm/rc4-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) rc4-586.pl coff $(CFLAGS) > ../$@)
 # a.out
 rx86-out.s: asm/rc4-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) rc4-586.pl a.out $(CFLAGS) > ../$@)
 
-asm/rc4-amd64.s: asm/rc4-amd64.pl;	$(PERL) $< $@
+rc4-amd64.s: asm/rc4-amd64.pl;	$(PERL) $< $@
 
-asm/rc4-ia64.s: asm/rc4-ia64.S
+rc4-ia64.s: asm/rc4-ia64.S
 	$(CC) $(CFLAGS) -E asm/rc4-ia64.S > $@
 
 files:
@@ -100,7 +95,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/rx86unix.cpp asm/*.s asm/*.o *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/crypto/rc5/Makefile.ssl b/crypto/rc5/Makefile.ssl
index 305ead0ddf..e5d2b2b462 100644
--- a/crypto/rc5/Makefile.ssl
+++ b/crypto/rc5/Makefile.ssl
@@ -51,10 +51,10 @@ lib:	$(LIBOBJ)
 	@touch lib
 
 # ELF
-asm/r586-elf.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+r586-elf.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
 	(cd asm; $(PERL) rc5-586.pl elf $(CFLAGS) > ../$@)
 # COFF
-asm/r586-cof.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+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
@@ -92,7 +92,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/r586unix.cpp asm/*.s asm/*.o *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/crypto/ripemd/Makefile.ssl b/crypto/ripemd/Makefile.ssl
index f47ce22353..051695cd19 100644
--- a/crypto/ripemd/Makefile.ssl
+++ b/crypto/ripemd/Makefile.ssl
@@ -49,10 +49,10 @@ lib:    $(LIBOBJ)
 	@touch lib
 
 # ELF
-asm/rm86-elf.s: asm/rmd-586.pl ../perlasm/x86asm.pl
+rm86-elf.s: asm/rmd-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) rmd-586.pl elf $(CFLAGS) > ../$@)
 # COFF
-asm/rm86-cof.s: asm/rmd-586.pl ../perlasm/x86asm.pl
+rm86-cof.s: asm/rmd-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) rmd-586.pl coff $(CFLAGS) > ../$@)
 # a.out
 rm86-out.s: asm/rmd-586.pl ../perlasm/x86asm.pl
@@ -90,7 +90,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/rm86unix.cpp asm/*.s asm/*.o *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl
index 16a4351b01..71adb3c38c 100644
--- a/crypto/sha/Makefile.ssl
+++ b/crypto/sha/Makefile.ssl
@@ -49,14 +49,14 @@ lib:    $(LIBOBJ)
 	@touch lib
 
 # ELF
-asm/sx86-elf.s: asm/sha1-586.pl ../perlasm/x86asm.pl
+sx86-elf.s: asm/sha1-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) sha1-586.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
-asm/s512sse2-elf.s:	asm/sha512-sse2.pl ../perlasm/x86asm.pl
+s512sse2-elf.s:	asm/sha512-sse2.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) sha512-sse2.pl elf $(CFLAGS) $(PROCESSOR) > ../$@)
 # COFF
-asm/sx86-cof.s: asm/sha1-586.pl ../perlasm/x86asm.pl
+sx86-cof.s: asm/sha1-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) sha1-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
-asm/s512sse2-cof.s:     asm/sha512-sse2.pl ../perlasm/x86asm.pl
+s512sse2-cof.s:     asm/sha512-sse2.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) sha512-sse2.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)
 # a.out
 sx86-out.s: asm/sha1-586.pl ../perlasm/x86asm.pl
@@ -64,11 +64,11 @@ sx86-out.s: asm/sha1-586.pl ../perlasm/x86asm.pl
 s512sse2-out.s:     asm/sha512-sse2.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) sha512-sse2.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
 
-asm/sha1-ia64.s:   asm/sha1-ia64.pl
+sha1-ia64.s:   asm/sha1-ia64.pl
 	(cd asm; $(PERL) sha1-ia64.pl $(CFLAGS) ) > $@
-asm/sha256-ia64.s: asm/sha512-ia64.pl
+sha256-ia64.s: asm/sha512-ia64.pl
 	(cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))
-asm/sha512-ia64.s: asm/sha512-ia64.pl
+sha512-ia64.s: asm/sha512-ia64.pl
 	(cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))
 
 files:
@@ -103,7 +103,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f asm/sx86unix.cpp asm/*.s asm/*.o *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.