From 4affc436d3c24ac29a12a712913ebf271fdc648d Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 30 May 2022 15:50:15 +0200 Subject: [PATCH] Leverage CFLAGS from environment in contrib Makefiles --- contrib/dlz/example/Makefile | 2 +- contrib/dlz/modules/bdbhpt/Makefile | 2 +- contrib/dlz/modules/filesystem/Makefile | 2 +- contrib/dlz/modules/ldap/Makefile | 2 +- contrib/dlz/modules/mysql/Makefile | 2 +- contrib/dlz/modules/mysqldyn/Makefile | 2 +- contrib/dlz/modules/sqlite3/Makefile | 2 +- contrib/dlz/modules/wildcard/Makefile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/dlz/example/Makefile b/contrib/dlz/example/Makefile index c4479403e2..5c66ba1f31 100644 --- a/contrib/dlz/example/Makefile +++ b/contrib/dlz/example/Makefile @@ -16,7 +16,7 @@ # this means this Makefile is not portable, so the testsuite # skips this test on platforms where it doesn't build -CFLAGS=-Wall -fPIC -g +CFLAGS += -Wall -fPIC -g all: dlz_example.so diff --git a/contrib/dlz/modules/bdbhpt/Makefile b/contrib/dlz/modules/bdbhpt/Makefile index 45080af743..29d6b94cc6 100644 --- a/contrib/dlz/modules/bdbhpt/Makefile +++ b/contrib/dlz/modules/bdbhpt/Makefile @@ -26,7 +26,7 @@ prefix = /usr libdir = $(prefix)/lib/bind9 -CFLAGS=-fPIC -g -I../include +CFLAGS += -fPIC -g -I../include BDB_LIBS=-ldb all: dlz_bdbhpt_dynamic.so diff --git a/contrib/dlz/modules/filesystem/Makefile b/contrib/dlz/modules/filesystem/Makefile index 40ecb79c5b..6c5470f343 100644 --- a/contrib/dlz/modules/filesystem/Makefile +++ b/contrib/dlz/modules/filesystem/Makefile @@ -26,7 +26,7 @@ prefix = /usr libdir = $(prefix)/lib/bind9 -CFLAGS=-fPIC -g -I../include +CFLAGS += -fPIC -g -I../include all: dlz_filesystem_dynamic.so diff --git a/contrib/dlz/modules/ldap/Makefile b/contrib/dlz/modules/ldap/Makefile index 8e86e3ef97..d9b6ff5bfe 100644 --- a/contrib/dlz/modules/ldap/Makefile +++ b/contrib/dlz/modules/ldap/Makefile @@ -26,7 +26,7 @@ prefix = /usr libdir = $(prefix)/lib/bind9 -CFLAGS=-fPIC -g -I../include +CFLAGS += -fPIC -g -I../include LDAP_LIBS=-lldap all: dlz_ldap_dynamic.so diff --git a/contrib/dlz/modules/mysql/Makefile b/contrib/dlz/modules/mysql/Makefile index 606dcefe6c..5d0904c13f 100644 --- a/contrib/dlz/modules/mysql/Makefile +++ b/contrib/dlz/modules/mysql/Makefile @@ -26,7 +26,7 @@ prefix = /usr libdir = $(prefix)/lib/bind9 -CFLAGS=-fPIC -g -I../include $(shell mysql_config --cflags) +CFLAGS += -fPIC -g -I../include $(shell mysql_config --cflags) MYSQL_LIBS=$(shell mysql_config --libs) all: dlz_mysql_dynamic.so diff --git a/contrib/dlz/modules/mysqldyn/Makefile b/contrib/dlz/modules/mysqldyn/Makefile index 38fe4ff9b1..f78cd2ff2e 100644 --- a/contrib/dlz/modules/mysqldyn/Makefile +++ b/contrib/dlz/modules/mysqldyn/Makefile @@ -26,7 +26,7 @@ prefix = /usr libdir = $(prefix)/lib/bind9 -CFLAGS=-fPIC -g -I../include $(shell mysql_config --cflags) +CFLAGS += -fPIC -g -I../include $(shell mysql_config --cflags) MYSQL_LIBS=$(shell mysql_config --libs) all: dlz_mysqldyn_mod.so diff --git a/contrib/dlz/modules/sqlite3/Makefile b/contrib/dlz/modules/sqlite3/Makefile index b7861ded55..1532921b95 100644 --- a/contrib/dlz/modules/sqlite3/Makefile +++ b/contrib/dlz/modules/sqlite3/Makefile @@ -26,7 +26,7 @@ prefix = /usr libdir = $(prefix)/lib/bind9 -CFLAGS=-fPIC -g -I../include +CFLAGS += -fPIC -g -I../include SQLITE3_LIBS=-lsqlite3 all: dlz_sqlite3_dynamic.so diff --git a/contrib/dlz/modules/wildcard/Makefile b/contrib/dlz/modules/wildcard/Makefile index d09a83a8be..087a3538e9 100644 --- a/contrib/dlz/modules/wildcard/Makefile +++ b/contrib/dlz/modules/wildcard/Makefile @@ -27,7 +27,7 @@ prefix = /usr libdir = $(prefix)/lib/bind9 -CFLAGS=-fPIC -g -I../include +CFLAGS += -fPIC -g -I../include all: dlz_wildcard_dynamic.so