mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Remove the extra CFLAGS from libisc_CFLAGS and libdns_CFLAGS

Browse Source 
The extra library CFLAGS were causing the headers to be included in
wrong order possibly pulling header files from previously installed
BIND 9 version.

This commit cleans up the extra <foo>_CFLAGS from the includes in favor
of not exposing 3rd party headers in our own header files.
This commit is contained in:
Ondřej Surý
2021-02-11 14:07:26 +01:00
committed by Mark Andrews
parent 5f1a76c710
commit 00b5f4c389
1 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile.top
View File

@@ -18,11 +18,6 @@ AM_LDFLAGS += \
-Wl,-flat_namespace -Wl,-flat_namespace
endif HOST_MACOS endif HOST_MACOS
if HAVE_GSSAPI
AM_CPPFLAGS += \
$(GSSAPI_CFLAGS)
endif
LIBISC_CFLAGS = \ LIBISC_CFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib/isc/unix/include \ -I$(top_srcdir)/lib/isc/unix/include \
@@ -30,21 +25,6 @@ LIBISC_CFLAGS = \
-I$(top_srcdir)/lib/isc/include \ -I$(top_srcdir)/lib/isc/include \
-I$(top_builddir)/lib/isc/include -I$(top_builddir)/lib/isc/include
if HAVE_JSON_C
LIBISC_CFLAGS += \
$(JSON_C_CFLAGS)
endif HAVE_JSON_C
if HAVE_LIBXML2
LIBISC_CFLAGS += \
$(LIBXML2_CFLAGS)
endif HAVE_LIBXML2
if HAVE_READLINE
LIBISC_CFLAGS += \
$(READLINE_CFLAGS)
endif HAVE_READLINE
LIBISC_LIBS = $(top_builddir)/lib/isc/libisc.la LIBISC_LIBS = $(top_builddir)/lib/isc/libisc.la
LIBDNS_CFLAGS = \ LIBDNS_CFLAGS = \
@@ -54,16 +34,6 @@ LIBDNS_CFLAGS = \
LIBDNS_LIBS = \ LIBDNS_LIBS = \
$(top_builddir)/lib/dns/libdns.la $(top_builddir)/lib/dns/libdns.la
if HAVE_DNSTAP
LIBDNS_CFLAGS += \
$(DNSTAP_CFLAGS)
endif HAVE_DNSTAP
if HAVE_LMDB
LIBDNS_CFLAGS += \
$(LMDB_CFLAGS)
endif HAVE_LMDB
LIBNS_CFLAGS = \ LIBNS_CFLAGS = \
-I$(top_srcdir)/lib/ns/include -I$(top_srcdir)/lib/ns/include