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 /crypto | |
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 'crypto')
-rw-r--r-- | crypto/Makefile.in | 4 | ||||
-rw-r--r-- | crypto/pkcs7/Makefile.in | 2 | ||||
-rw-r--r-- | crypto/ts/Makefile.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crypto/Makefile.in b/crypto/Makefile.in index 21dd827a7c..56a83e1746 100644 --- a/crypto/Makefile.in +++ b/crypto/Makefile.in @@ -20,9 +20,9 @@ RECURSIVE_MAKE= [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \ $(MAKE) -e TOP=../.. DIR=$$i INCLUDES='$(INCLUDES)' $$target ) || exit 1; \ done; -PEX_LIBS= +LDFLAGS= EX_LIBS= - + CFLAGS= $(INCLUDE) $(CFLAG) ASFLAGS= $(INCLUDE) $(ASFLAG) AFLAGS=$(ASFLAGS) diff --git a/crypto/pkcs7/Makefile.in b/crypto/pkcs7/Makefile.in index e5854a9873..7c895785ad 100644 --- a/crypto/pkcs7/Makefile.in +++ b/crypto/pkcs7/Makefile.in @@ -10,7 +10,7 @@ CFLAG=-g MAKEFILE= Makefile AR= ar r -PEX_LIBS= +LDFLAGS= EX_LIBS= CFLAGS= $(INCLUDES) $(CFLAG) diff --git a/crypto/ts/Makefile.in b/crypto/ts/Makefile.in index 79fa917f3d..8fe12fc84f 100644 --- a/crypto/ts/Makefile.in +++ b/crypto/ts/Makefile.in @@ -15,7 +15,7 @@ MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile AR= ar r -PEX_LIBS= +LDFLAGS= EX_LIBS= CFLAGS= $(INCLUDES) $(CFLAG) |