upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-05-28 04:35:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Cleanup; fix the way libraries are linked; Make-It-Simple(tm)"

Browse source 
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 a97e5fbda2.
This commit is contained in:
Thomas Guyot-Sionnest 2009-01-09 02:27:02 -05:00
parent 254baca111
commit 7449b16b17
2 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = . tests
SUBDIRS = tests
noinst_LIBRARIES = libnagiosplug.a

37
lib/tests/Makefile.am
View file

@ -24,11 +24,40 @@ else
tap_ldflags = -L/usr/local/lib
endif
AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
AM_LDFLAGS = $(tap_ldflags) -ltap
LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a
test_utils_SOURCES = test_utils.c
test_utils_CFLAGS = -g -I.. $(tap_cflags)
test_utils_LDFLAGS = $(tap_ldflags) -ltap
test_utils_LDADD = ../utils_base.o $(tap_ldadd)
SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini.c test_opts.c
test_disk_SOURCES = test_disk.c
test_disk_CFLAGS = -g -I.. $(tap_cflags)
test_disk_LDFLAGS = $(tap_ldflags) -ltap
test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a
test_tcp_SOURCES = test_tcp.c
test_tcp_CFLAGS = -g -I.. $(tap_cflags)
test_tcp_LDFLAGS = $(tap_ldflags) -ltap
test_tcp_LDADD = ../utils_tcp.o $(tap_ldadd)
test_cmd_SOURCES = test_cmd.c
test_cmd_CFLAGS = -g -I.. $(tap_cflags)
test_cmd_LDFLAGS = $(tap_ldflags) -ltap
test_cmd_LDADD = ../utils_cmd.o ../utils_base.o $(tap_ldadd)
test_base64_SOURCES = test_base64.c
test_base64_CFLAGS = -g -I.. $(tap_cflags)
test_base64_LDFLAGS = $(tap_ldflags) -ltap
test_base64_LDADD = $(top_srcdir)/gl/base64.o $(tap_ldadd)
test_ini_SOURCES = test_ini.c
test_ini_CFLAGS = -g -I.. $(tap_cflags)
test_ini_LDFLAGS = $(tap_ldflags) -ltap
test_ini_LDADD = ../utils_base.o ../parse_ini.o $(tap_ldadd)
test_opts_SOURCES = test_opts.c
test_opts_CFLAGS = -g -I.. $(tap_cflags)
test_opts_LDFLAGS = $(tap_ldflags) -ltap
test_opts_LDADD = ../utils_base.o ../parse_ini.o ../extra_opts.o $(tap_ldadd)
test: ${noinst_PROGRAMS}
perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)