From 202295436c1ba7f49873721c6b448e3aada08272 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 21 Dec 2022 16:20:57 +0100 Subject: [PATCH] BUILD: makefile: support DEVICEATLAS_CFLAGS and DEVICEATLAS_LDFLAGS The CFLAGS and LDFLAGS appended by USE_DEVICEATLAS can now be overridden using DEVICEATLAS_CFLAGS and DEVICEATLAS_LDFLAGS. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 20dd0405a..c5c15ec9a 100644 --- a/Makefile +++ b/Makefile @@ -641,7 +641,7 @@ ifneq ($(USE_DEVICEATLAS),) DEVICEATLAS_INC = $(DEVICEATLAS_SRC) DEVICEATLAS_LIB = $(DEVICEATLAS_SRC) ifeq ($(DEVICEATLAS_SRC),) - OPTIONS_LDFLAGS += -lda + DEVICEATLAS_LDFLAGS += -lda else ifeq ($(USE_PCRE),) ifeq ($(USE_PCRE2),) @@ -649,7 +649,7 @@ ifneq ($(USE_DEVICEATLAS),) endif endif ifneq ($(USE_PCRE2),) - OPTIONS_CFLAGS += -DDA_REGEX_HDR=\"dac_pcre2.c\" -DDA_REGEX_TAG=2 + DEVICEATLAS_CFLAGS += -DDA_REGEX_HDR=\"dac_pcre2.c\" -DDA_REGEX_TAG=2 endif OPTIONS_OBJS += $(DEVICEATLAS_LIB)/Os/daunix.o OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dadwcom.o @@ -658,7 +658,7 @@ ifneq ($(USE_DEVICEATLAS),) OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dac.o endif OPTIONS_OBJS += addons/deviceatlas/da.o - OPTIONS_CFLAGS += $(if $(DEVICEATLAS_INC),-I$(DEVICEATLAS_INC)) + DEVICEATLAS_CFLAGS += $(if $(DEVICEATLAS_INC),-I$(DEVICEATLAS_INC)) endif # Use 51DEGREES_SRC and possibly 51DEGREES_INC and 51DEGREES_LIB to force path