SF.net SVN: nagiosplug:[2118] nagiosplug/trunk/lib

Revision: 2118
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2118&view=rev
Author:   dermoth
Date:     2009-01-07 09:44:21 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
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(-)

From: Thomas Guyot-Sionnest <[email protected]>

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

Modified: nagiosplug/trunk/lib/Makefile.am
===================================================================
--- nagiosplug/trunk/lib/Makefile.am	2009-01-06 05:51:13 UTC (rev 2117)
+++ nagiosplug/trunk/lib/Makefile.am	2009-01-07 09:44:21 UTC (rev 2118)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = tests
+SUBDIRS = . tests
 
 noinst_LIBRARIES = libnagiosplug.a
 

Modified: nagiosplug/trunk/lib/tests/Makefile.am
===================================================================
--- nagiosplug/trunk/lib/tests/Makefile.am	2009-01-06 05:51:13 UTC (rev 2117)
+++ nagiosplug/trunk/lib/tests/Makefile.am	2009-01-07 09:44:21 UTC (rev 2118)
@@ -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.

------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB