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)
@@ -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