diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-02-06 13:23:34 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-02-06 13:23:34 +0000 |
| commit | 67ea999d4a0b7873b3d88a48773eeb1bb59799a2 (patch) | |
| tree | 96e830c0dc2f05907bbcf3579fa06dda96bde181 /crypto/rc4 | |
| parent | e1892f23707393d12522c3a586e75b8237038f2f (diff) | |
| download | openssl-67ea999d4a0b7873b3d88a48773eeb1bb59799a2.tar.gz | |
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...
Diffstat (limited to 'crypto/rc4')
| -rw-r--r-- | crypto/rc4/Makefile.ssl | 15 |
1 files changed, 5 insertions, 10 deletions
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. |