Fixed --help output (Ask Bjoern Hansen - #1714823)

[nagiosplug.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e89e4b0d8f718e9e90ed6c2192fa553a5f382167..b76bf76d989e2f2f2976cbe379ed6de535b375c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,28 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl lib plugins plugins-scripts plugins-root m4 po
+SUBDIRS = gl lib plugins plugins-scripts plugins-root po
 
 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
+       config_test/Makefile config_test/run_tests config_test/child_test.c \
+       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
+       rm -rf `find $(distdir) -name CVS`
 
 install-root:
        cd plugins-root && $(MAKE) $@
 
 test:
+       cd lib && $(MAKE) test
        cd plugins; $(MAKE) test
        cd plugins-scripts; $(MAKE) test