diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-09-06 20:45:36 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-09-06 20:45:36 +0000 |
| commit | ed28aef8b455be436f252dfceac49a958a92e53b (patch) | |
| tree | cd34319f2128612e24d78d06571cdc4c24eab614 /engines/Makefile | |
| parent | 0486cce653b62d26a8ca37ac12f69f1a6b998844 (diff) | |
Padlock engine: make it independent of inline assembler.
Diffstat (limited to 'engines/Makefile')
| -rw-r--r-- | engines/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/engines/Makefile b/engines/Makefile index 65c4991135..190d4a1cdd 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -16,10 +16,13 @@ RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \ $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \ done; +ENGINES_ASM_OBJ= + PEX_LIBS= EX_LIBS= CFLAGS= $(INCLUDES) $(CFLAG) +ASFLAGS= $(INCLUDES) $(ASFLAG) GENERAL=Makefile engines.com install.com engine_vector.mar TEST= @@ -49,7 +52,8 @@ LIBOBJ= e_4758cca.o \ e_sureware.o \ e_ubsec.o \ e_padlock.o \ - e_capi.o + e_capi.o \ + $(ENGINES_ASM_OBJ) SRC= $(LIBSRC) @@ -77,7 +81,7 @@ lib: $(LIBOBJ) set -e; \ for l in $(LIBNAMES); do \ $(MAKE) -f ../Makefile.shared -e \ - LIBNAME=$$l LIBEXTRAS=e_$$l.o \ + LIBNAME=$$l LIBEXTRAS="e_$$l*.o" \ LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \ link_o.$(SHLIB_TARGET); \ done; \ @@ -87,6 +91,11 @@ lib: $(LIBOBJ) fi; \ touch lib +e_padlock-x86.s: asm/e_padlock-x86.pl + $(PERL) asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ +e_padlock-x86_64.s: asm/e_padlock-x86_64.pl + $(PERL) asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) > $@ + subdirs: echo $(EDIRS) @target=all; $(RECURSIVE_MAKE) |