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

diff --git a/Makefile.am b/Makefile.am
index a45758a..b6e5f2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,32 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = lib plugins plugins-scripts plugins-root m4 po
+SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
 EXTRA_DIST = config.rpath \
-	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING FAQ LEGAL \
-	REQUIREMENTS SUPPORT THANKS \
+	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
+	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 m4
+ACLOCAL_AMFLAGS = -I gl/m4 -I m4
 
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\"
 
 dist-hook:
 	make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
+	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}$$//" $? > $@
@@ -54,3 +57,4 @@ THANKS: THANKS.in
 
 pkgclean:
 	rm -rf $(BUILDDIR) $(PACKDIR)
+