X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=701c56cc231ef3a874f67520b6b74a4a8db419cb;hb=d1c9a5cf6a8c5e7990e3efd167d84dc8f1d8a042;hp=7fe5447c38883e4e2caba34d4e3952b1fcab41d0;hpb=fee4763db44ef71dff247d97d28ec4f670acbed0;p=nagiosplug.git

diff --git a/Makefile.am b/Makefile.am
index 7fe5447..701c56c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,39 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl lib plugins plugins-scripts po
+SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
 EXTRA_DIST = config.rpath \
-	ABOUT-NLS CODING FAQ LEGAL REQUIREMENTS SUPPORT THANKS \
-	Helper.pm contrib pkg nagios-plugins.spec
+	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 lib
+ACLOCAL_AMFLAGS = -I gl/m4 -I m4
 
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\"
 
 dist-hook:
-	make THANKS nagios-plugins.spec
+	make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
+	rm -rf `find $(distdir) -name CVS`
+
+install-root:
+	cd plugins-root && $(MAKE) $@
 
 test:
-	cd plugins; $(MAKE) test
-	cd plugins-scripts; $(MAKE) test
+	cd lib && $(MAKE) test
+	if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) test; fi
+	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,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." >> $@