commit 202295436c1ba7f49873721c6b448e3aada08272
author Willy Tarreau <w@1wt.eu> Wed Dec 21 16:20:57 2022 +0100
committer Willy Tarreau <w@1wt.eu> Fri Dec 23 16:53:35 2022 +0100
tree 6bf7955c7c767c69fba6a15f628d4d079ad2df0b
parent b2ef365de2d9382af876bbe6cfa26df7dac03649

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

diff --git a/Makefile b/Makefile
index 20dd040..c5c15ec 100644
--- a/Makefile
+++ b/Makefile
@@ -641,7 +641,7 @@
   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 @@
       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 @@
     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