code cleanups, largely resulting from turning on -Wall. mostly

[nagiosplug.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 21778407f54ff8503cbed21076b5199dbd410602..e89e4b0d8f718e9e90ed6c2192fa553a5f382167 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl lib plugins plugins-scripts po
+SUBDIRS = intl lib plugins plugins-scripts plugins-root m4 po
 
 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 CHANGES CODING FAQ LEGAL \
+       REQUIREMENTS SUPPORT THANKS \
+       NPTest.pm contrib pkg nagios-plugins.spec \
+       config_test/Makefile config_test/run_tests config_test/child_test.c
 
-ACLOCAL_AMFLAGS = -I lib
+ACLOCAL_AMFLAGS = -I m4
 
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\"
@@ -14,6 +16,9 @@ DEFS = -DLOCALEDIR=\"$(localedir)\"
 dist-hook:
        make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
 
+install-root:
+       cd plugins-root && $(MAKE) $@
+
 test:
        cd plugins; $(MAKE) test
        cd plugins-scripts; $(MAKE) test
@@ -38,7 +43,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." >> $@