Fix for regex input of '|', being output causing problems with Nagios' parsing of

[nagiosplug.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 21778407f54ff8503cbed21076b5199dbd410602..b6e5f2ec1ce1a9a770fa20c0717be94fb11e9804 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,32 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl lib plugins plugins-scripts po
+SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
 EXTRA_DIST = config.rpath \
-       ABOUT-NLS CHANGES CODING FAQ LEGAL REQUIREMENTS SUPPORT THANKS \
-       Helper.pm contrib pkg nagios-plugins.spec
+       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 lib
+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
 
-test:
-       cd plugins; $(MAKE) test
-       cd plugins-scripts; $(MAKE) test
+install-root:
+       cd plugins-root && $(MAKE) $@
+
+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}$$//" $? > $@
@@ -38,7 +48,7 @@ solpkg:
        $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
        cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
 
-THANKS: AUTHORS
+THANKS: THANKS.in
        @echo "This software is brought to you by the Nagios Plugins Development Team. However," > $@
        @echo "there have been many contributors to this project. Everyone below has helped in " >> $@
        @echo "raising bug reports, creating patches or contributing new plugins." >> $@
@@ -47,3 +57,4 @@ THANKS: AUTHORS
 
 pkgclean:
        rm -rf $(BUILDDIR) $(PACKDIR)
+