Small Makefile.in cleanup
authorRichard Levitte <levitte@openssl.org>
Mon, 25 Jan 2016 21:23:42 +0000 (22:23 +0100)
committerRichard Levitte <levitte@openssl.org>
Mon, 25 Jan 2016 21:23:42 +0000 (22:23 +0100)
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 <rsalz@openssl.org>
Makefile.in
engines/Makefile.in

index 7db430d..842da88 100644 (file)
@@ -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)'              \
index 53a0ca1..b258019 100644 (file)
@@ -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