X-Git-Url: https://git.tokkee.org/?p=nagiosplug.git;a=blobdiff_plain;f=Makefile.am;h=b6e5f2ec1ce1a9a770fa20c0717be94fb11e9804;hp=b76bf76d989e2f2f2976cbe379ed6de535b375c6;hb=1a5a83bb82c35d888229fe9f815fbc663c0f4d3c;hpb=b06427a14098e81675bd63957f0e12259162222c

diff --git a/Makefile.am b/Makefile.am
index b76bf76..b6e5f2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = gl lib plugins plugins-scripts plugins-root po
+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
 
 ACLOCAL_AMFLAGS = -I gl/m4 -I m4
@@ -16,15 +17,16 @@ 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) $@
 
-test:
-	cd lib && $(MAKE) test
-	cd plugins; $(MAKE) test
-	cd plugins-scripts; $(MAKE) test
+test test-debug:
+	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}$$//" $? > $@
@@ -55,3 +57,4 @@ THANKS: THANKS.in
 
 pkgclean:
 	rm -rf $(BUILDDIR) $(PACKDIR)
+