From: Ondřej Surý Date: Wed, 21 Apr 2021 12:22:18 +0000 (+0200) Subject: Move the include Makefile.tests to the bottom of Makefile.am(s) X-Git-Tag: v9.17.16~11^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e59a359929e341cce13673ba4e72054893a6ca7d;p=thirdparty%2Fbind9.git 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. --- diff --git a/Makefile.tests b/Makefile.tests index 3b5e07d90c6..70d528285ca 100644 --- a/Makefile.tests +++ b/Makefile.tests @@ -1,11 +1,17 @@ # Hey Emacs, this is -*- makefile-automake -*- file! # vim: filetype=automake +unit-local: check + +TESTS = $(check_PROGRAMS) + +LOG_COMPILER = $(builddir)/../../unit-test-driver.sh + AM_CPPFLAGS += \ $(CMOCKA_CFLAGS) \ -DNAMED_PLUGINDIR=\"$(libdir)/named\" \ -DSKIPPED_TEST_EXIT_CODE=77 \ -DTESTS_DIR=\"$(abs_srcdir)\" -LDADD = \ +LDADD += \ $(CMOCKA_LIBS) diff --git a/Makefile.top b/Makefile.top index 58268763711..68bbc1242dc 100644 --- a/Makefile.top +++ b/Makefile.top @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -I$(srcdir)/include AM_LDFLAGS = +LDADD = if HOST_MACOS AM_LDFLAGS += \ diff --git a/bin/check/Makefile.am b/bin/check/Makefile.am index fd8e51ba659..8f63c3506af 100644 --- a/bin/check/Makefile.am +++ b/bin/check/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS += \ $(LIBISCCFG_CFLAGS) \ $(LIBBIND9_CFLAGS) -AM_CPPFLAGS += \ +AM_CPPFLAGS += \ -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\" noinst_LTLIBRARIES = libcheck-tool.la @@ -16,7 +16,7 @@ libcheck_tool_la_SOURCES = \ check-tool.h \ check-tool.c -LDADD = \ +LDADD += \ libcheck-tool.la \ $(LIBISC_LIBS) \ $(LIBDNS_LIBS) \ diff --git a/bin/confgen/Makefile.am b/bin/confgen/Makefile.am index d43aa2004ad..c1dca431943 100644 --- a/bin/confgen/Makefile.am +++ b/bin/confgen/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS += \ $(LIBDNS_CFLAGS) \ -DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" -LDADD = \ +LDADD += \ libconfgen.la \ $(LIBISC_LIBS) \ $(LIBDNS_LIBS) diff --git a/bin/dig/Makefile.am b/bin/dig/Makefile.am index e130df08c14..32dea5bbfdf 100644 --- a/bin/dig/Makefile.am +++ b/bin/dig/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS += \ $(LIBBIND9_CFLAGS) \ $(LIBIDN2_CFLAGS) -LDADD = \ +LDADD += \ libdighost.la \ $(LIBISC_LIBS) \ $(LIBDNS_LIBS) \ @@ -19,8 +19,8 @@ LDADD = \ noinst_LTLIBRARIES = libdighost.la -libdighost_la_SOURCES = \ - dighost.h \ +libdighost_la_SOURCES = \ + dighost.h \ dighost.c bin_PROGRAMS = dig host nslookup diff --git a/bin/dnssec/Makefile.am b/bin/dnssec/Makefile.am index 7aeaccc97c9..32c462620a7 100644 --- a/bin/dnssec/Makefile.am +++ b/bin/dnssec/Makefile.am @@ -4,12 +4,12 @@ AM_CPPFLAGS += \ $(LIBISC_CFLAGS) \ $(LIBDNS_CFLAGS) -AM_CPPFLAGS += \ +AM_CPPFLAGS += \ -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\" noinst_LTLIBRARIES = libdnssectool.la -LDADD = \ +LDADD += \ libdnssectool.la \ $(LIBISC_LIBS) \ $(LIBDNS_LIBS) diff --git a/bin/nsupdate/Makefile.am b/bin/nsupdate/Makefile.am index fc0e62b99cf..18c8645f827 100644 --- a/bin/nsupdate/Makefile.am +++ b/bin/nsupdate/Makefile.am @@ -10,10 +10,10 @@ AM_CPPFLAGS += \ $(KRB5_CFLAGS) \ $(READLINE_CFLAGS) -AM_CPPFLAGS += \ +AM_CPPFLAGS += \ -DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\" -LDADD = \ +LDADD += \ $(LIBISC_LIBS) \ $(LIBDNS_LIBS) \ $(LIBISCCFG_LIBS) \ diff --git a/bin/pkcs11/Makefile.am b/bin/pkcs11/Makefile.am index 1bcd014980d..b80c1c74fbc 100644 --- a/bin/pkcs11/Makefile.am +++ b/bin/pkcs11/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.top AM_CPPFLAGS += \ $(LIBISC_CFLAGS) -LDADD = \ +LDADD += \ $(LIBISC_LIBS) bin_PROGRAMS = \ diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am index 4ef54205a1f..0a3bfc090b9 100644 --- a/bin/tests/system/Makefile.am +++ b/bin/tests/system/Makefile.am @@ -14,7 +14,7 @@ SUBDIRS = dyndb/driver dlzexternal/driver hooks/driver AM_CPPFLAGS += \ $(LIBISC_CFLAGS) -LDADD = \ +LDADD += \ $(LIBISC_LIBS) if HAVE_PERL diff --git a/bin/tools/Makefile.am b/bin/tools/Makefile.am index ff9bef39e90..04072560dc6 100644 --- a/bin/tools/Makefile.am +++ b/bin/tools/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS += \ $(LIBISC_CFLAGS) \ $(LIBDNS_CFLAGS) -LDADD = \ +LDADD += \ $(LIBDNS_LIBS) \ $(LIBISC_LIBS) diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am index bf5aa3eeb2e..2dae4543f5d 100644 --- a/fuzz/Makefile.am +++ b/fuzz/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS += \ AM_LDFLAGS += \ $(FUZZ_LDFLAGS) -LDADD = \ +LDADD += \ libfuzzmain.la \ $(LIBISC_LIBS) \ $(LIBDNS_LIBS) diff --git a/lib/dns/tests/Makefile.am b/lib/dns/tests/Makefile.am index 006a2bf5efc..04707f12c51 100644 --- a/lib/dns/tests/Makefile.am +++ b/lib/dns/tests/Makefile.am @@ -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 diff --git a/lib/irs/tests/Makefile.am b/lib/irs/tests/Makefile.am index d2566638535..8e6e52f6fb8 100644 --- a/lib/irs/tests/Makefile.am +++ b/lib/irs/tests/Makefile.am @@ -1,5 +1,4 @@ include $(top_srcdir)/Makefile.top -include $(top_srcdir)/Makefile.tests AM_CPPFLAGS += \ $(LIBISC_CFLAGS) \ @@ -9,13 +8,9 @@ LDADD += \ $(LIBISC_LIBS) \ $(LIBIRS_LIBS) -check_PROGRAMS = \ +check_PROGRAMS = \ resconf_test -TESTS = $(check_PROGRAMS) - -unit-local: check - EXTRA_DIST = testdata -LOG_COMPILER = $(builddir)/../../unit-test-driver.sh +include $(top_srcdir)/Makefile.tests diff --git a/lib/isc/tests/Makefile.am b/lib/isc/tests/Makefile.am index c8da51d3ee9..b21bd7a4a00 100644 --- a/lib/isc/tests/Makefile.am +++ b/lib/isc/tests/Makefile.am @@ -1,5 +1,4 @@ include $(top_srcdir)/Makefile.top -include $(top_srcdir)/Makefile.tests AM_CPPFLAGS += \ $(LIBISC_CFLAGS) @@ -15,7 +14,7 @@ libisctest_la_SOURCES = \ isctest.h \ uv_wrap.h -TESTS = \ +check_PROGRAMS = \ aes_test \ buffer_test \ counter_test \ @@ -49,9 +48,6 @@ TESTS = \ time_test \ timer_test -check_PROGRAMS = \ - $(TESTS) - doh_test_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(LIBUV_CFLAGS) \ @@ -91,8 +87,6 @@ netmgr_test_LDADD = \ $(LDADD) \ $(LIBUV_LIBS) -unit-local: check - EXTRA_DIST = testdata -LOG_COMPILER = $(builddir)/../../unit-test-driver.sh +include $(top_srcdir)/Makefile.tests diff --git a/lib/isccc/tests/Makefile.am b/lib/isccc/tests/Makefile.am index 048f2a9f0f6..7cab5b72afe 100644 --- a/lib/isccc/tests/Makefile.am +++ b/lib/isccc/tests/Makefile.am @@ -1,5 +1,4 @@ include $(top_srcdir)/Makefile.top -include $(top_srcdir)/Makefile.tests AM_CPPFLAGS += \ $(LIBISC_CFLAGS) \ @@ -9,11 +8,7 @@ LDADD += \ $(LIBISC_LIBS) \ $(LIBISCCC_LIBS) -check_PROGRAMS = \ +check_PROGRAMS = \ result_test -TESTS = $(check_PROGRAMS) - -unit-local: check - -LOG_COMPILER = $(builddir)/../../unit-test-driver.sh +include $(top_srcdir)/Makefile.tests diff --git a/lib/isccfg/tests/Makefile.am b/lib/isccfg/tests/Makefile.am index 19b82a45b3b..cb21d57fc5a 100644 --- a/lib/isccfg/tests/Makefile.am +++ b/lib/isccfg/tests/Makefile.am @@ -1,5 +1,4 @@ include $(top_srcdir)/Makefile.top -include $(top_srcdir)/Makefile.tests AM_CPPFLAGS += \ $(LIBISC_CFLAGS) \ @@ -11,12 +10,8 @@ LDADD += \ $(LIBDNS_LIBS) \ $(LIBISCCFG_LIBS) -check_PROGRAMS = \ - duration_test \ +check_PROGRAMS = \ + duration_test \ parser_test -TESTS = $(check_PROGRAMS) - -unit-local: check - -LOG_COMPILER = $(builddir)/../../unit-test-driver.sh +include $(top_srcdir)/Makefile.tests diff --git a/lib/ns/tests/Makefile.am b/lib/ns/tests/Makefile.am index 31390fabfed..6b08b213465 100644 --- a/lib/ns/tests/Makefile.am +++ b/lib/ns/tests/Makefile.am @@ -1,5 +1,4 @@ include $(top_srcdir)/Makefile.top -include $(top_srcdir)/Makefile.tests AM_CPPFLAGS += \ $(LIBISC_CFLAGS) \ @@ -14,7 +13,7 @@ LDADD += \ check_LTLIBRARIES = libnstest.la libnstest_la_SOURCES = \ - nstest.c \ + nstest.c \ nstest.h check_PROGRAMS = \ @@ -23,10 +22,6 @@ check_PROGRAMS = \ plugin_test \ query_test -TESTS = $(check_PROGRAMS) - -unit-local: check - EXTRA_DIST = testdata -LOG_COMPILER = $(builddir)/../../unit-test-driver.sh +include $(top_srcdir)/Makefile.tests