Integrate Vector Permutation AES into build system.

[openssl.git] / crypto / aes / Makefile

diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index 4e49b5d7317d39cf9ed9f2970b4eba011ca3fd4a..78d59841404ceea2b289cfb5d76cee26a4ede5f2 100644 (file)
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -41,7 +41,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(AR) $(LIB) $(LIBOBJ)
+       $(ARX) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
@@ -50,13 +50,19 @@ aes-ia64.s: asm/aes-ia64.S
 
 aes-586.s:     asm/aes-586.pl ../perlasm/x86asm.pl
        $(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+vpaes-x86.s:   asm/vpaes-x86.pl ../perlasm/x86asm.pl
+       $(PERL) asm/vpaes-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 aesni-x86.s:   asm/aesni-x86.pl ../perlasm/x86asm.pl
        $(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
 aes-x86_64.s: asm/aes-x86_64.pl
        $(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@
+vpaes-x86_64.s:        asm/vpaes-x86_64.pl
+       $(PERL) asm/vpaes-x86_64.pl $(PERLASM_SCHEME) > $@
 aesni-x86_64.s: asm/aesni-x86_64.pl
        $(PERL) asm/aesni-x86_64.pl $(PERLASM_SCHEME) > $@
+aesni-sha1-x86_64.s:   asm/aesni-sha1-x86_64.pl
+       $(PERL) asm/aesni-sha1-x86_64.pl $(PERLASM_SCHEME) > $@
 
 aes-sparcv9.s: asm/aes-sparcv9.pl
        $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@
@@ -67,8 +73,12 @@ aes-ppc.s:   asm/aes-ppc.pl
 aes-parisc.s:  asm/aes-parisc.pl
        $(PERL) asm/aes-parisc.pl $(PERLASM_SCHEME) $@
 
+aes-mips.s:    asm/aes-mips.pl
+       $(PERL) asm/aes-mips.pl $(PERLASM_SCHEME) $@
+
 # GNU make "catch all"
-aes-%.s:       asm/aes-%.pl;   $(PERL) $< $(PERLASM_SCHEME) $@
+aes-%.S:       asm/aes-%.pl;   $(PERL) $< $(PERLASM_SCHEME) $@
+aes-armv4.o:   aes-armv4.S
 
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -107,14 +117,28 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-aes_cbc.o: ../../include/openssl/aes.h ../../include/openssl/modes.h
-aes_cbc.o: ../../include/openssl/opensslconf.h aes_cbc.c
-aes_cfb.o: ../../include/openssl/aes.h ../../include/openssl/modes.h
-aes_cfb.o: ../../include/openssl/opensslconf.h aes_cfb.c
-aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
-aes_core.o: ../../include/openssl/opensslconf.h aes_core.c aes_locl.h
-aes_ecb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
-aes_ecb.o: ../../include/openssl/opensslconf.h aes_ecb.c aes_locl.h
+aes_cbc.o: ../../include/openssl/aes.h ../../include/openssl/crypto.h
+aes_cbc.o: ../../include/openssl/e_os2.h ../../include/openssl/modes.h
+aes_cbc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+aes_cbc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+aes_cbc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+aes_cbc.o: aes_cbc.c
+aes_cfb.o: ../../include/openssl/aes.h ../../include/openssl/crypto.h
+aes_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/modes.h
+aes_cfb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+aes_cfb.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+aes_cfb.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+aes_cfb.o: aes_cfb.c
+aes_core.o: ../../include/openssl/aes.h ../../include/openssl/crypto.h
+aes_core.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+aes_core.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+aes_core.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+aes_core.o: ../../include/openssl/symhacks.h aes_core.c aes_locl.h
+aes_ecb.o: ../../include/openssl/aes.h ../../include/openssl/crypto.h
+aes_ecb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+aes_ecb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+aes_ecb.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+aes_ecb.o: ../../include/openssl/symhacks.h aes_ecb.c aes_locl.h
 aes_ige.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/bio.h
 aes_ige.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 aes_ige.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -125,8 +149,12 @@ aes_ige.o: ../../include/openssl/symhacks.h ../cryptlib.h aes_ige.c aes_locl.h
 aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
 aes_misc.o: ../../include/openssl/opensslconf.h
 aes_misc.o: ../../include/openssl/opensslv.h aes_locl.h aes_misc.c
-aes_ofb.o: ../../include/openssl/aes.h ../../include/openssl/modes.h
-aes_ofb.o: ../../include/openssl/opensslconf.h aes_ofb.c
+aes_ofb.o: ../../include/openssl/aes.h ../../include/openssl/crypto.h
+aes_ofb.o: ../../include/openssl/e_os2.h ../../include/openssl/modes.h
+aes_ofb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+aes_ofb.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+aes_ofb.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+aes_ofb.o: aes_ofb.c
 aes_wrap.o: ../../e_os.h ../../include/openssl/aes.h
 aes_wrap.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 aes_wrap.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h