diff --git a/Makefile.am b/Makefile.am
index 1fb696f6166f5534a6ee0fad12438d34a11cd20b..3cd939aca62d6d7b46b6dfaf81881c5c64b98f48 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
## Process this file with automake to produce Makefile.in
-SUBDIRS = gl lib plugins plugins-scripts plugins-root po
+SUBDIRS = gl @INCLUDE_TAP_DIR@ lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
+# Have to list TAP_DIR manually to get in distribution
EXTRA_DIST = config.rpath \
- ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING FAQ LEGAL \
- REQUIREMENTS SUPPORT THANKS \
+ 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 \
- tools/tinderbox_build
+ perlmods tools/build_perl_modules \
+ tools/tinderbox_build \
+ external/tap-1.01
ACLOCAL_AMFLAGS = -I gl/m4 -I m4
dist-hook:
make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
- rm -rf `find $(distdir) -name CVS`
+ echo ${VERSION} >$(distdir)/version
install-root:
cd plugins-root && $(MAKE) $@
-test:
- cd lib && $(MAKE) test
- cd plugins; $(MAKE) test
- cd plugins-scripts; $(MAKE) test
+tap:
+ cd @TAP_DIR@ && $(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}$$//" $? > $@
pkgclean:
rm -rf $(BUILDDIR) $(PACKDIR)
+