diff --git a/Makefile.am b/Makefile.am
index 208dbbabf689eee5ddfd7f327313647fa01334d9..b6e5f2ec1ce1a9a770fa20c0717be94fb11e9804 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
## Process this file with automake to produce Makefile.in
-SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
+SUBDIRS = gl tap 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 \
+ NP-VERSION-GEN 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 \
- external/tap-1.01
+ tools/tinderbox_build
ACLOCAL_AMFLAGS = -I gl/m4 -I m4
dist-hook:
make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
- rm -rf `find $(distdir) -name CVS`
+ echo ${VERSION} >$(distdir)/release
install-root:
cd plugins-root && $(MAKE) $@
-tap:
- cd @TAP_DIR@ && $(MAKE)
-
-test test-debug: tap
+test test-debug:
cd lib && $(MAKE) $@
if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi
cd plugins && $(MAKE) $@
pkgclean:
rm -rf $(BUILDDIR) $(PACKDIR)
+