The branch master has been updated
via 05e4e63366593298a362393c8152863771d92130 (commit)
from f0bd4686758ea13ae5f05b8c43a0903344f89148 (commit)
- Log -----------------------------------------------------------------
commit 05e4e63366593298a362393c8152863771d92130
Author: Richard Levitte <levi...@openssl.org>
Date: Mon Jan 25 22:23:42 2016 +0100
Small Makefile.in cleanup
engines_obj changed name to padlock_obj in Configure. We need to do
the corresponding ENGINES_ASM_OBJ -> PADLOCK_ASM_OBJ in appropriate
Makefile.ins.
Reviewed-by: Rich Salz <rs...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 4 ++--
engines/Makefile.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 7db430d..842da88 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,7 +105,7 @@ RMD160_ASM_OBJ= {- $target{rmd160_obj} -}
WP_ASM_OBJ= {- $target{wp_obj} -}
CMLL_ENC= {- $target{cmll_obj} -}
MODES_ASM_OBJ= {- $target{modes_obj} -}
-ENGINES_ASM_OBJ= {- $target{engines_obj} -}
+PADLOCK_ASM_OBJ= {- $target{padlock_obj} -}
CHACHA_ENC= {- $target{chacha_obj} -}
POLY1305_ASM_OBJ= {- $target{poly1305_obj} -}
PERLASM_SCHEME= {- $target{perlasm_scheme} -}
@@ -228,7 +228,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)'
PROCESSOR='$(PROCESSOR)'\
RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)' \
WP_ASM_OBJ='$(WP_ASM_OBJ)' \
MODES_ASM_OBJ='$(MODES_ASM_OBJ)' \
- ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)' \
+ PADLOCK_ASM_OBJ='$(PADLOCK_ASM_OBJ)' \
CHACHA_ENC='$(CHACHA_ENC)' \
POLY1305_ASM_OBJ='$(POLY1305_ASM_OBJ)' \
PERLASM_SCHEME='$(PERLASM_SCHEME)' \
diff --git a/engines/Makefile.in b/engines/Makefile.in
index 53a0ca1..b258019 100644
--- a/engines/Makefile.in
+++ b/engines/Makefile.in
@@ -13,7 +13,7 @@ CFLAG=-g
MAKEFILE= Makefile
AR= ar r
-ENGINES_ASM_OBJ=
+PADLOCK_ASM_OBJ=
PEX_LIBS=
EX_LIBS=
@@ -34,7 +34,7 @@ LIBOBJ= \
e_padlock.o \
e_capi.o \
e_dasync.o \
- $(ENGINES_ASM_OBJ)
+ $(PADLOCK_ASM_OBJ)
TESTLIBNAMES= ossltest
TESTLIBSRC= e_ossltest.c
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
