Support for Tru64 for check_procs + additional test cases

[nagiosplug.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 50c7edde47a0cdd897e610ad9723f900c8a83083..cc46a465f0471ea976515957be0eb847f7225de7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,31 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl lib plugins plugins-scripts po
+SUBDIRS = intl lib plugins plugins-scripts m4 po
 
 EXTRA_DIST = config.rpath \
-       ABOUT-NLS CODING FAQ LEGAL REQUIREMENTS SUPPORT THANKS \
-       Helper.pm contrib pkg nagios-plugins.spec.in
+       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)\"
 
 dist-hook:
-       sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec
+       make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
 
 test:
        cd plugins; $(MAKE) test
        cd plugins-scripts; $(MAKE) test
 
 nagios-plugins.spec: nagios-plugins.spec.in
-       sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;" $? > $@
+       sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@
+
+pkg/fedora/nagios-plugins.spec: nagios-plugins.spec.in
+       $(top_srcdir)/mkinstalldirs pkg/fedora
+       sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;/^# Requires$$/r $(top_srcdir)/pkg/fedora/requires" $? > $@
 
 # Solaris pkgmk
 BUILDDIR = build-solaris
@@ -34,8 +40,12 @@ solpkg:
        $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
        cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
 
-THANKS: THANKS.in AUTHORS
-       perl -e ' while (<>) { print STDERR "Duplicate: $$_",$$/ if ($$a{$$_}) ; $$a{$$_}++}; print sort by_last_field (keys %a); sub by_last_field { ($$a1) = $$a =~ /\s(\w+)$$/; ($$b1) = $$b =~ /\s(\w+)$$/; $$a1 cmp $$b1}' AUTHORS | cat THANKS.in - > $@
+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." >> $@
+       @echo "" >> $@
+       perl -e ' while (<>) { print STDERR "Duplicate: $$_",$$/ if ($$a{$$_}) ; $$a{$$_}++}; print sort by_last_field (keys %a); sub by_last_field { ($$a1) = $$a =~ /\s(\w+)$$/; ($$b1) = $$b =~ /\s(\w+)$$/; $$a1 cmp $$b1}' $? >> $@
 
 pkgclean:
        rm -rf $(BUILDDIR) $(PACKDIR)