X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=b6e5f2ec1ce1a9a770fa20c0717be94fb11e9804;hb=181107290e5265b5b50f7131dbccaee38dc32db8;hp=98b0dcc456d6b018756da5182c70c2bc3d8f8d8c;hpb=6c476db6dcc7aa70a687d09c10e6ad515c290c23;p=nagiosplug.git

diff --git a/Makefile.am b/Makefile.am
index 98b0dcc..b6e5f2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
 ## 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@
 
 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 @TAP_DIR@
+	tools/tinderbox_build
 
 ACLOCAL_AMFLAGS = -I gl/m4 -I m4
 
@@ -17,15 +17,12 @@ DEFS = -DLOCALEDIR=\"$(localedir)\"
 
 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) $@
@@ -60,3 +57,4 @@ THANKS: THANKS.in
 
 pkgclean:
 	rm -rf $(BUILDDIR) $(PACKDIR)
+