Preparation for 1.4.12 release

[nagiosplug.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1fb696f6166f5534a6ee0fad12438d34a11cd20b..416ef62bc8f2d784d162e1d7bc75a0523003d007 100644 (file)
--- 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 lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
 EXTRA_DIST = config.rpath \
-       ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING FAQ LEGAL \
+       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
 
 ACLOCAL_AMFLAGS = -I gl/m4 -I m4
@@ -21,10 +22,11 @@ dist-hook:
 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}$$//" $? > $@