diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2009-01-18 21:26:58 (GMT) |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2009-01-18 21:26:58 (GMT) |
commit | 82674792c7ef5503812524615b6e83603cd25d60 (patch) | |
tree | 216bf6ed58837ea68654e95a77b1bab28a9a16b3 | |
parent | 9276888e34dfdde8adb112953a4adbd8d98f5918 (diff) | |
download | monitoring-plugins-82674792c7ef5503812524615b6e83603cd25d60.tar.gz |
Re-apply "Cleanup; fix the way libraries are linked; Make-It-Simple(tm)"
This reverts commit 7449b16b1781c645751e2c05b93893e93630fb2a.
-rw-r--r-- | lib/tests/Makefile.am | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 596d00f..1b036fe 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am | |||
@@ -24,40 +24,11 @@ else | |||
24 | tap_ldflags = -L/usr/local/lib | 24 | tap_ldflags = -L/usr/local/lib |
25 | endif | 25 | endif |
26 | 26 | ||
27 | test_utils_SOURCES = test_utils.c | 27 | AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags) |
28 | test_utils_CFLAGS = -g -I.. $(tap_cflags) | 28 | AM_LDFLAGS = $(tap_ldflags) -ltap |
29 | test_utils_LDFLAGS = $(tap_ldflags) -ltap | 29 | LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a |
30 | test_utils_LDADD = ../utils_base.o $(tap_ldadd) | ||
31 | 30 | ||
32 | test_disk_SOURCES = test_disk.c | 31 | SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini.c test_opts.c |
33 | test_disk_CFLAGS = -g -I.. $(tap_cflags) | ||
34 | test_disk_LDFLAGS = $(tap_ldflags) -ltap | ||
35 | test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a | ||
36 | |||
37 | test_tcp_SOURCES = test_tcp.c | ||
38 | test_tcp_CFLAGS = -g -I.. $(tap_cflags) | ||
39 | test_tcp_LDFLAGS = $(tap_ldflags) -ltap | ||
40 | test_tcp_LDADD = ../utils_tcp.o $(tap_ldadd) | ||
41 | |||
42 | test_cmd_SOURCES = test_cmd.c | ||
43 | test_cmd_CFLAGS = -g -I.. $(tap_cflags) | ||
44 | test_cmd_LDFLAGS = $(tap_ldflags) -ltap | ||
45 | test_cmd_LDADD = ../utils_cmd.o ../utils_base.o $(tap_ldadd) | ||
46 | |||
47 | test_base64_SOURCES = test_base64.c | ||
48 | test_base64_CFLAGS = -g -I.. $(tap_cflags) | ||
49 | test_base64_LDFLAGS = $(tap_ldflags) -ltap | ||
50 | test_base64_LDADD = $(top_srcdir)/gl/base64.o $(tap_ldadd) | ||
51 | |||
52 | test_ini_SOURCES = test_ini.c | ||
53 | test_ini_CFLAGS = -g -I.. $(tap_cflags) | ||
54 | test_ini_LDFLAGS = $(tap_ldflags) -ltap | ||
55 | test_ini_LDADD = ../utils_base.o ../parse_ini.o $(tap_ldadd) | ||
56 | |||
57 | test_opts_SOURCES = test_opts.c | ||
58 | test_opts_CFLAGS = -g -I.. $(tap_cflags) | ||
59 | test_opts_LDFLAGS = $(tap_ldflags) -ltap | ||
60 | test_opts_LDADD = ../utils_base.o ../parse_ini.o ../extra_opts.o $(tap_ldadd) | ||
61 | 32 | ||
62 | test: ${noinst_PROGRAMS} | 33 | test: ${noinst_PROGRAMS} |
63 | perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) | 34 | perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) |