summaryrefslogtreecommitdiffstats
path: root/lib/tests
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2009-01-09 07:27:02 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2009-01-09 07:27:02 (GMT)
commit7449b16b1781c645751e2c05b93893e93630fb2a (patch)
tree7092e96b66be5b19239679912bce5cc863a9c704 /lib/tests
parent254baca11109777e444a598b604e2cd99e814f75 (diff)
downloadmonitoring-plugins-7449b16b1781c645751e2c05b93893e93630fb2a.tar.gz
Revert "Cleanup; fix the way libraries are linked; Make-It-Simple(tm)"
Trying to see if this has any relation to the tinderbox failure. I doubt it and will revert back as soon as it's tested. This reverts commit a97e5fbda21a05574b0e3c5a5118402ebfbbd13c.
Diffstat (limited to 'lib/tests')
-rw-r--r--lib/tests/Makefile.am37
1 files changed, 33 insertions, 4 deletions
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 1b036fe..596d00f 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -24,11 +24,40 @@ else
24tap_ldflags = -L/usr/local/lib 24tap_ldflags = -L/usr/local/lib
25endif 25endif
26 26
27AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags) 27test_utils_SOURCES = test_utils.c
28AM_LDFLAGS = $(tap_ldflags) -ltap 28test_utils_CFLAGS = -g -I.. $(tap_cflags)
29LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a 29test_utils_LDFLAGS = $(tap_ldflags) -ltap
30test_utils_LDADD = ../utils_base.o $(tap_ldadd)
30 31
31SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini.c test_opts.c 32test_disk_SOURCES = test_disk.c
33test_disk_CFLAGS = -g -I.. $(tap_cflags)
34test_disk_LDFLAGS = $(tap_ldflags) -ltap
35test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a
36
37test_tcp_SOURCES = test_tcp.c
38test_tcp_CFLAGS = -g -I.. $(tap_cflags)
39test_tcp_LDFLAGS = $(tap_ldflags) -ltap
40test_tcp_LDADD = ../utils_tcp.o $(tap_ldadd)
41
42test_cmd_SOURCES = test_cmd.c
43test_cmd_CFLAGS = -g -I.. $(tap_cflags)
44test_cmd_LDFLAGS = $(tap_ldflags) -ltap
45test_cmd_LDADD = ../utils_cmd.o ../utils_base.o $(tap_ldadd)
46
47test_base64_SOURCES = test_base64.c
48test_base64_CFLAGS = -g -I.. $(tap_cflags)
49test_base64_LDFLAGS = $(tap_ldflags) -ltap
50test_base64_LDADD = $(top_srcdir)/gl/base64.o $(tap_ldadd)
51
52test_ini_SOURCES = test_ini.c
53test_ini_CFLAGS = -g -I.. $(tap_cflags)
54test_ini_LDFLAGS = $(tap_ldflags) -ltap
55test_ini_LDADD = ../utils_base.o ../parse_ini.o $(tap_ldadd)
56
57test_opts_SOURCES = test_opts.c
58test_opts_CFLAGS = -g -I.. $(tap_cflags)
59test_opts_LDFLAGS = $(tap_ldflags) -ltap
60test_opts_LDADD = ../utils_base.o ../parse_ini.o ../extra_opts.o $(tap_ldadd)
32 61
33test: ${noinst_PROGRAMS} 62test: ${noinst_PROGRAMS}
34 perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) 63 perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)