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

 lib/Makefile.am       |    2 +-
 lib/tests/Makefile.am |   37 ++++---------------------------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 73c12911e1ab34351e54897d6010cde42e208d47..17e4c1b0fae55af4bd30a7d3dbb113717278af33 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = tests
+SUBDIRS = . tests
 
 noinst_LIBRARIES = libnagiosplug.a
 

diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 596d00fd3bc2834f03bd8a758ce0a9e34f9c46b0..1b036fe475f20ac5698c8848b20252b2e47784ea 100644 (file)
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -24,40 +24,11 @@ else
 tap_ldflags = -L/usr/local/lib
 endif
 
-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)
+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_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)
+SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini.c test_opts.c
 
 test: ${noinst_PROGRAMS}
        perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)