From 6c476db6dcc7aa70a687d09c10e6ad515c290c23 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Thu, 26 Jun 2008 22:00:08 +0000 Subject: Adding libtap into distribution to help run C based tests git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2013 f882894a-f735-0410-b71e-b25c423dba1c --- lib/tests/Makefile.am | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib/tests') diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 25e2bed3..45c11527 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -15,39 +15,41 @@ EXTRA_DIST = $(np_test_scripts) $(np_test_files) LIBS = @LIBINTL@ +TAP_LIB_DIR = $(top_srcdir)/@TAP_DIR@/src + test_utils_SOURCES = test_utils.c test_utils_CFLAGS = -g -I.. -test_utils_LDFLAGS = -L/usr/local/lib -ltap +test_utils_LDFLAGS = -L$(TAP_LIB_DIR) -ltap test_utils_LDADD = ../utils_base.o test_disk_SOURCES = test_disk.c test_disk_CFLAGS = -g -I.. -test_disk_LDFLAGS = -L/usr/local/lib -ltap +test_disk_LDFLAGS = -L$(TAP_LIB_DIR) -ltap test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a test_tcp_SOURCES = test_tcp.c test_tcp_CFLAGS = -g -I.. -test_tcp_LDFLAGS = -L/usr/local/lib -ltap +test_tcp_LDFLAGS = -L$(TAP_LIB_DIR) -ltap test_tcp_LDADD = ../utils_tcp.o test_cmd_SOURCES = test_cmd.c test_cmd_CFLAGS = -g -I.. -test_cmd_LDFLAGS = -L/usr/local/lib -ltap +test_cmd_LDFLAGS = -L$(TAP_LIB_DIR) -ltap test_cmd_LDADD = ../utils_cmd.o ../utils_base.o test_base64_SOURCES = test_base64.c test_base64_CFLAGS = -g -I.. -test_base64_LDFLAGS = -L/usr/local/lib -ltap +test_base64_LDFLAGS = -L$(TAP_LIB_DIR) -ltap test_base64_LDADD = $(top_srcdir)/gl/base64.o test_ini_SOURCES = test_ini.c test_ini_CFLAGS = -g -I.. -test_ini_LDFLAGS = -L/usr/local/lib -ltap +test_ini_LDFLAGS = -L$(TAP_LIB_DIR) -ltap test_ini_LDADD = ../utils_base.o ../parse_ini.o test_opts_SOURCES = test_opts.c test_opts_CFLAGS = -g -I.. -test_opts_LDFLAGS = -L/usr/local/lib -ltap +test_opts_LDFLAGS = -L$(TAP_LIB_DIR) -ltap test_opts_LDADD = ../utils_base.o ../parse_ini.o ../extra_opts.o test: ${noinst_PROGRAMS} -- cgit v1.2.3-74-g34f1