diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2006-07-13 12:50:23 +0000 |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2006-07-13 12:50:23 +0000 |
commit | 548083b2ea865474915fc8a9ddd361e997585a02 (patch) | |
tree | f3766c1f5d8f8ea1b2b721a5792e4fb4daf1cf68 /plugins/Makefile.am | |
parent | 6b9cc76d0a27631fbab19a31ab8bd46e143b7580 (diff) | |
download | monitoring-plugins-548083b2ea865474915fc8a9ddd361e997585a02.tar.gz |
Move new util_* functions to lib/
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1451 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins/Makefile.am')
-rw-r--r-- | plugins/Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 28793cdc..9dd71845 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am | |||
@@ -1,7 +1,5 @@ | |||
1 | ## Process this file with automake to produce Makefile.in | 1 | ## Process this file with automake to produce Makefile.in |
2 | 2 | ||
3 | SUBDIRS = tests | ||
4 | |||
5 | VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t | 3 | VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t |
6 | 4 | ||
7 | INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ | 5 | INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ |
@@ -45,7 +43,6 @@ TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir) | |||
45 | TESTS = @PLUGIN_TEST@ | 43 | TESTS = @PLUGIN_TEST@ |
46 | 44 | ||
47 | test: | 45 | test: |
48 | cd tests && make test | ||
49 | perl -I $(top_builddir) -I $(top_srcdir) ../test.pl | 46 | perl -I $(top_builddir) -I $(top_srcdir) ../test.pl |
50 | 47 | ||
51 | AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@ | 48 | AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@ |
@@ -55,7 +52,7 @@ AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@ | |||
55 | 52 | ||
56 | check_apt_LDADD = $(BASEOBJS) runcmd.o | 53 | check_apt_LDADD = $(BASEOBJS) runcmd.o |
57 | check_dig_LDADD = $(NETLIBS) runcmd.o | 54 | check_dig_LDADD = $(NETLIBS) runcmd.o |
58 | check_disk_LDADD = $(BASEOBJS) popen.o utils_disk.o | 55 | check_disk_LDADD = $(BASEOBJS) popen.o |
59 | check_dns_LDADD = $(NETLIBS) runcmd.o | 56 | check_dns_LDADD = $(NETLIBS) runcmd.o |
60 | check_dummy_LDADD = $(BASEOBJS) | 57 | check_dummy_LDADD = $(BASEOBJS) |
61 | check_fping_LDADD = $(NETLIBS) popen.o | 58 | check_fping_LDADD = $(NETLIBS) popen.o |
@@ -98,7 +95,7 @@ urlize_LDADD = $(BASEOBJS) popen.o | |||
98 | 95 | ||
99 | check_apt_DEPENDENCIES = check_apt.c $(BASEOBJS) runcmd.o $(DEPLIBS) | 96 | check_apt_DEPENDENCIES = check_apt.c $(BASEOBJS) runcmd.o $(DEPLIBS) |
100 | check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) runcmd.o $(DEPLIBS) | 97 | check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) runcmd.o $(DEPLIBS) |
101 | check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o utils_disk.o $(DEPLIBS) | 98 | check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS) |
102 | check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) runcmd.o $(DEPLIBS) | 99 | check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) runcmd.o $(DEPLIBS) |
103 | check_dummy_DEPENDENCIES = check_dummy.c $(DEPLIBS) | 100 | check_dummy_DEPENDENCIES = check_dummy.c $(DEPLIBS) |
104 | check_fping_DEPENDENCIES = check_fping.c $(NETOBJS) popen.o $(DEPLIBS) | 101 | check_fping_DEPENDENCIES = check_fping.c $(NETOBJS) popen.o $(DEPLIBS) |