From 875051669aa5393b89d15737dfe669ccccd51613 Mon Sep 17 00:00:00 2001 From: Ed Kellett Date: Sat, 7 Nov 2020 23:48:04 +0000 Subject: [PATCH] tests: implicitly link *_util.c into every test --- tests/Makefile.am | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f1279114..1bcd9465 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,29 +14,17 @@ check_PROGRAMS = runtests \ AM_CFLAGS=$(WARNFLAGS) AM_CPPFLAGS = $(DEFAULT_INCLUDES) -I../librb/include -I.. AM_LDFLAGS = -no-install -LDADD = tap/libtap.a ../librb/src/librb.la ../ircd/libircd.la -ldl +LDADD = libutil.a tap/libtap.a ../librb/src/librb.la ../ircd/libircd.la -ldl # Override -rpath or programs will be linked to installed libraries libdir=$(abs_top_builddir) runtests_CPPFLAGS = -DC_TAP_SOURCE='"$(abs_top_srcdir)/tests"' \ -DC_TAP_BUILD='"$(abs_top_builddir)/tests"' -check_LIBRARIES = tap/libtap.a +check_LIBRARIES = tap/libtap.a libutil.a tap_libtap_a_SOURCES = tap/basic.c tap/basic.h \ tap/float.c tap/float.h tap/macros.h - -chmode1_SOURCES = chmode1.c ircd_util.c client_util.c -match1_SOURCES = match1.c -msgbuf_parse1_SOURCES = msgbuf_parse1.c -msgbuf_unparse1_SOURCES = msgbuf_unparse1.c -hostmask1_SOURCES = hostmask1.c -rb_dictionary1_SOURCES = rb_dictionary1.c -rb_snprintf_append1_SOURCES = rb_snprintf_append1.c -rb_snprintf_try_append1_SOURCES = rb_snprintf_try_append1.c -sasl_abort1_SOURCES = sasl_abort1.c ircd_util.c client_util.c -send1_SOURCES = send1.c ircd_util.c client_util.c -serv_connect1_SOURCES = serv_connect1.c ircd_util.c client_util.c -substitution1_SOURCES = substitution1.c +libutil_a_SOURCES = ircd_util.c client_util.c check-local: $(check_PROGRAMS) \ ../authd/authd \