diff options
| author | Richard Levitte <richard@levitte.org> | 2016-01-29 18:07:37 +0100 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-01-29 18:36:57 +0100 |
| commit | 1740c16265a1630d12af1412d49c24ef25626590 (patch) | |
| tree | 2c39365f20d0a10bcf76a9157bdc3a2d4e195f3a /Makefile.in | |
| parent | ddf47a10cd351a9e09fb8886d0567e997fa75e55 (diff) | |
Configure et al: split up the lflags configuration item into two
The lflags configuration had a weird syntax with a % as separator. If
it was present, whatever came before ended up as PEX_LIBS in Makefile
(usually, this is LDFLAGS), while whatever came after ended up as
EX_LIBS.
This change splits that item into lflags and ex_libs, making their use
more explicit.
Also, PEX_LIBS in all the Makefiles are renamed to LDFLAGS.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 80d5f175d0..4abda2249c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,8 +62,8 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -} CC= $(CROSS_COMPILE){- $target{cc} -} CFLAG= {- $config{cflags} -} DEPFLAG= {- $config{depflags} -} -PEX_LIBS= {- $config{prelflags} -} -EX_LIBS= {- $config{lflags} -} +LDFLAGS= {- $config{lflags} -} +EX_LIBS= {- $config{ex_libs} -} EXE_EXT= {- $target{exe_extension} -} ARFLAGS= {- $target{arflags} -} AR=$(CROSS_COMPILE){- $target{ar} -} $(ARFLAGS) r @@ -216,7 +216,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \ SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \ - PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)' \ + LDFLAGS='$(LDFLAGS)' EX_LIBS='$(EX_LIBS)' \ CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)' \ EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)' \ AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)' \ |