Add option for "compact" rounds to aes_x86core.c. "Compact" rounds are

[openssl.git] / crypto / aes / Makefile

diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index 8c05e8ee2fe1170d15e89c6c070cc5a3ca2b19af..448760bd4b8b720183caab7b2c9d898250b37552 100644 (file)
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -8,8 +8,6 @@ CC=     cc
 CPP=   $(CC) -E
 INCLUDES=
 CFLAG=-g
 CPP=   $(CC) -E
 INCLUDES=
 CFLAG=-g

-MAKEDEPPROG=   makedepend
-MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

 MAKEFILE=      Makefile
 AR=            ar r
 
 MAKEFILE=      Makefile
 AR=            ar r
 


@@ -57,6 +55,12 @@ ax86-cof.s: asm/aes-586.pl ../perlasm/x86asm.pl
 ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl
        (cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
 
 ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl
        (cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
 

+aes-x86_64.s: asm/aes-x86_64.pl
+       $(PERL) asm/aes-x86_64.pl $@
+
+aes-sparcv9.s: asm/aes-sparcv9.pl
+       $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@
+

 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 


@@ -65,9 +69,7 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 

-install: installs
-
-installs:
+install:

        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
        do  \
        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
        do  \


@@ -84,6 +86,7 @@ lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:

+       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...

        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 dclean:
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 dclean:


@@ -100,6 +103,7 @@ aes_cbc.o: ../../include/openssl/opensslconf.h aes_cbc.c aes_locl.h
 aes_cfb.o: ../../e_os.h ../../include/openssl/aes.h
 aes_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 aes_cfb.o: aes_cfb.c aes_locl.h
 aes_cfb.o: ../../e_os.h ../../include/openssl/aes.h
 aes_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 aes_cfb.o: aes_cfb.c aes_locl.h

+aes_x86core.o: ../../include/openssl/aes.h aes_locl.h

 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_ctr.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
 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_ctr.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h