diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2008-11-28 03:22:39 -0500 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2008-11-28 03:22:39 -0500 |
commit | 538b97cea63d68efbd9c9c67d9c41278cfd1ebad (patch) | |
tree | 84e707f97fb82f1920fb7568241e8b5d8f71c0af /Makefile.am | |
parent | d40abb2504b99e1318840ad1a5d9f4a340c465b5 (diff) | |
download | monitoring-plugins-538b97cea63d68efbd9c9c67d9c41278cfd1ebad.tar.gz |
Revert inclusion of libtap into nagiosplugins
(except for the NEWS file)
This reverts the following commits (latest first): f3e0909, 9f16b54, be8df51, f31cd40, 5270c7d, a25083f, f1bfe40, c503d85 and 6c476db
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 70325781..a0bc561e 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -1,16 +1,14 @@ | |||
1 | ## Process this file with automake to produce Makefile.in | 1 | ## Process this file with automake to produce Makefile.in |
2 | 2 | ||
3 | SUBDIRS = gl @INCLUDE_TAP_DIR@ lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@ | 3 | SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@ |
4 | 4 | ||
5 | # Have to list TAP_DIR manually to get in distribution | ||
6 | EXTRA_DIST = config.rpath \ | 5 | EXTRA_DIST = config.rpath \ |
7 | ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \ | 6 | ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \ |
8 | NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \ | 7 | NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \ |
9 | NPTest.pm contrib pkg nagios-plugins.spec \ | 8 | NPTest.pm contrib pkg nagios-plugins.spec \ |
10 | config_test/Makefile config_test/run_tests config_test/child_test.c \ | 9 | config_test/Makefile config_test/run_tests config_test/child_test.c \ |
11 | perlmods tools/build_perl_modules \ | 10 | perlmods tools/build_perl_modules \ |
12 | tools/tinderbox_build \ | 11 | tools/tinderbox_build |
13 | external/tap-1.01 | ||
14 | 12 | ||
15 | ACLOCAL_AMFLAGS = -I gl/m4 -I m4 | 13 | ACLOCAL_AMFLAGS = -I gl/m4 -I m4 |
16 | 14 | ||
@@ -24,9 +22,6 @@ dist-hook: | |||
24 | install-root: | 22 | install-root: |
25 | cd plugins-root && $(MAKE) $@ | 23 | cd plugins-root && $(MAKE) $@ |
26 | 24 | ||
27 | tap: | ||
28 | cd @TAP_DIR@ && $(MAKE) | ||
29 | |||
30 | test test-debug: | 25 | test test-debug: |
31 | cd lib && $(MAKE) $@ | 26 | cd lib && $(MAKE) $@ |
32 | if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi | 27 | if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi |