[Nagiosplug-checkins] SF.net SVN: nagiosplug:[2132] nagiosplug/trunk/lib/tests/Makefile.am

[dermoth at users.sourceforge.net]

Revision: 2132
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2132&view=rev
Author:   dermoth
Date:     2009-01-19 05:08:30 +0000 (Mon, 19 Jan 2009)

Log Message:
-----------
Re-apply "Cleanup; fix the way libraries are linked; Make-It-Simple(tm)"

This reverts commit 7449b16b1781c645751e2c05b93893e93630fb2a.

From: Thomas Guyot-Sionnest <dermoth at aei.ca>

Modified Paths:
--------------
    nagiosplug/trunk/lib/tests/Makefile.am

Modified: nagiosplug/trunk/lib/tests/Makefile.am
===================================================================
--- nagiosplug/trunk/lib/tests/Makefile.am	2009-01-18 14:46:30 UTC (rev 2131)
+++ nagiosplug/trunk/lib/tests/Makefile.am	2009-01-19 05:08:30 UTC (rev 2132)
@@ -24,41 +24,12 @@
 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
+SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini.c test_opts.c
 
-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)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.