Fixed bug in tools/setup if docbook was run

[nagiosplug.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 701c56cc231ef3a874f67520b6b74a4a8db419cb..208dbbabf689eee5ddfd7f327313647fa01334d9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,15 @@
 
 SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
+# Have to list TAP_DIR manually to get in distribution
 EXTRA_DIST = config.rpath \
        ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
        REQUIREMENTS SUPPORT THANKS \
        NPTest.pm contrib pkg nagios-plugins.spec \
        config_test/Makefile config_test/run_tests config_test/child_test.c \
        perlmods tools/build_perl_modules \
-       tools/tinderbox_build
+       tools/tinderbox_build \
+       external/tap-1.01
 
 ACLOCAL_AMFLAGS = -I gl/m4 -I m4
 
@@ -22,11 +24,14 @@ dist-hook:
 install-root:
        cd plugins-root && $(MAKE) $@
 
-test:
-       cd lib && $(MAKE) test
-       if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) test; fi
-       cd plugins && $(MAKE) test
-       cd plugins-scripts && $(MAKE) test
+tap:
+       cd @TAP_DIR@ && $(MAKE)
+
+test test-debug: tap
+       cd lib && $(MAKE) $@
+       if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi
+       cd plugins && $(MAKE) $@
+       cd plugins-scripts && $(MAKE) $@
 
 nagios-plugins.spec: nagios-plugins.spec.in
        sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@