Move the include Makefile.tests to the bottom of Makefile.am(s)

The Makefile.tests was modifying global AM_CFLAGS and LDADD and could
accidentally pull /usr/include to be listed before the internal
libraries, which is known to cause problems if the headers from the
previous version of BIND 9 has been installed on the build machine.
This commit is contained in:
Ondřej Surý
2021-04-21 14:22:18 +02:00
committed by Ondřej Surý
parent 5c82f7c71b
commit e59a359929
17 changed files with 37 additions and 61 deletions

View File

@@ -1,5 +1,4 @@
include $(top_srcdir)/Makefile.top
include $(top_srcdir)/Makefile.tests
AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \
@@ -8,9 +7,9 @@ AM_CPPFLAGS += \
-DSRCDIR=\"$(abs_srcdir)\" \
-DBUILDDIR=\"$(abs_builddir)\"
LDADD += \
libdnstest.la \
$(LIBISC_LIBS) \
LDADD += \
libdnstest.la \
$(LIBISC_LIBS) \
$(LIBDNS_LIBS)
check_LTLIBRARIES = libdnstest.la
@@ -48,8 +47,6 @@ check_PROGRAMS = \
zonemgr_test \
zt_test
TESTS = $(check_PROGRAMS)
if HAVE_PERL
check_PROGRAMS += \
@@ -109,8 +106,6 @@ rsa_test_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(OPENSSL_CFLAGS)
unit-local: check
EXTRA_DIST = \
Kdh.+002+18602.key \
Krsa.+005+29235.key \
@@ -118,4 +113,4 @@ EXTRA_DIST = \
testdata \
testkeys
LOG_COMPILER = $(builddir)/../../unit-test-driver.sh
include $(top_srcdir)/Makefile.tests