From: Nicholas Nethercote Date: Wed, 5 Aug 2009 08:08:18 +0000 (+0000) Subject: More docs build tweaks: X-Git-Tag: svn/VALGRIND_3_5_0~129 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbcea71779073823c96219a42d28e2a1ea04d253;p=thirdparty%2Fvalgrind.git More docs build tweaks: - Actually remove the dead docs/images/massif*.png files (this was meant to happen in r10720). - Inline $TOOL/docs/Makefile.am into $TOOL/Makefile.am for all 10 tools. 10 fewer Makefile.am files FTW! git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10721 --- diff --git a/Makefile.tool.am b/Makefile.tool.am index fbc43fdfd6..c35ffc7b8d 100644 --- a/Makefile.tool.am +++ b/Makefile.tool.am @@ -1,5 +1,5 @@ -SUBDIRS = . tests docs +SUBDIRS = . tests include $(top_srcdir)/Makefile.all.am diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am index 04c798ec07..fa257f0485 100644 --- a/cachegrind/Makefile.am +++ b/cachegrind/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Makefile.tool.am +EXTRA_DIST = docs/cg-manual.xml + #---------------------------------------------------------------------------- # Headers, etc #---------------------------------------------------------------------------- diff --git a/cachegrind/docs/Makefile.am b/cachegrind/docs/Makefile.am deleted file mode 100644 index 8e61709bcd..0000000000 --- a/cachegrind/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = cg-manual.xml diff --git a/callgrind/Makefile.am b/callgrind/Makefile.am index 893cc9c937..f512d9a5a3 100644 --- a/callgrind/Makefile.am +++ b/callgrind/Makefile.am @@ -1,5 +1,13 @@ include $(top_srcdir)/Makefile.tool.am +EXTRA_DIST = \ + docs/cl-entities.xml \ + docs/cl-manual.xml \ + docs/cl-format.xml \ + docs/man-annotate.xml \ + docs/man-control.xml \ + docs/man-callgrind.xml + #---------------------------------------------------------------------------- # Headers, etc #---------------------------------------------------------------------------- diff --git a/callgrind/docs/Makefile.am b/callgrind/docs/Makefile.am deleted file mode 100644 index 2ed8f307d4..0000000000 --- a/callgrind/docs/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_DIST = \ - cl-entities.xml \ - cl-manual.xml \ - cl-format.xml \ - man-annotate.xml \ - man-control.xml \ - man-callgrind.xml diff --git a/configure.in b/configure.in index 1a8627fda6..5c7c7256db 100644 --- a/configure.in +++ b/configure.in @@ -1858,28 +1858,22 @@ AC_CONFIG_FILES([ memcheck/tests/darwin/Makefile memcheck/tests/x86-linux/Makefile memcheck/perf/Makefile - memcheck/docs/Makefile cachegrind/Makefile cachegrind/tests/Makefile cachegrind/tests/x86/Makefile - cachegrind/docs/Makefile cachegrind/cg_annotate callgrind/Makefile callgrind/callgrind_annotate callgrind/callgrind_control callgrind/tests/Makefile - callgrind/docs/Makefile helgrind/Makefile helgrind/tests/Makefile - helgrind/docs/Makefile massif/Makefile massif/tests/Makefile massif/perf/Makefile - massif/docs/Makefile massif/ms_print lackey/Makefile lackey/tests/Makefile - lackey/docs/Makefile none/Makefile none/tests/Makefile none/tests/amd64/Makefile @@ -1889,16 +1883,12 @@ AC_CONFIG_FILES([ none/tests/linux/Makefile none/tests/darwin/Makefile none/tests/x86-linux/Makefile - none/docs/Makefile exp-ptrcheck/Makefile exp-ptrcheck/tests/Makefile - exp-ptrcheck/docs/Makefile drd/Makefile - drd/docs/Makefile drd/scripts/download-and-build-splash2 drd/tests/Makefile exp-bbv/Makefile - exp-bbv/docs/Makefile exp-bbv/tests/Makefile exp-bbv/tests/x86/Makefile exp-bbv/tests/x86-linux/Makefile diff --git a/docs/images/massif-graph-sm.png b/docs/images/massif-graph-sm.png deleted file mode 100644 index 35894ff61b..0000000000 Binary files a/docs/images/massif-graph-sm.png and /dev/null differ diff --git a/docs/images/massif-graph.png b/docs/images/massif-graph.png deleted file mode 100644 index 972b31f7c9..0000000000 Binary files a/docs/images/massif-graph.png and /dev/null differ diff --git a/drd/Makefile.am b/drd/Makefile.am index 1a21f4d841..60c5ce4b9a 100644 --- a/drd/Makefile.am +++ b/drd/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Makefile.tool.am +EXTRA_DIST = docs/drd-manual.xml + #---------------------------------------------------------------------------- # Headers, flags #---------------------------------------------------------------------------- diff --git a/drd/docs/Makefile.am b/drd/docs/Makefile.am deleted file mode 100644 index 9d6f5f4778..0000000000 --- a/drd/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = drd-manual.xml diff --git a/exp-bbv/Makefile.am b/exp-bbv/Makefile.am index 367d0d4d40..aa7f40b410 100644 --- a/exp-bbv/Makefile.am +++ b/exp-bbv/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Makefile.tool.am +EXTRA_DIST = docs/bbv-manual.xml + #---------------------------------------------------------------------------- # exp-bbv- #---------------------------------------------------------------------------- diff --git a/exp-bbv/docs/Makefile.am b/exp-bbv/docs/Makefile.am deleted file mode 100644 index 734dc54394..0000000000 --- a/exp-bbv/docs/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = bbv-manual.xml - diff --git a/exp-ptrcheck/Makefile.am b/exp-ptrcheck/Makefile.am index 99ccf60535..5a9ffa4a17 100644 --- a/exp-ptrcheck/Makefile.am +++ b/exp-ptrcheck/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Makefile.tool.am +EXTRA_DIST = docs/pc-manual.xml + #---------------------------------------------------------------------------- # Headers, etc #---------------------------------------------------------------------------- diff --git a/exp-ptrcheck/docs/Makefile.am b/exp-ptrcheck/docs/Makefile.am deleted file mode 100644 index 60d2880ac7..0000000000 --- a/exp-ptrcheck/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = pc-manual.xml diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am index 1266b05409..795266a1a7 100644 --- a/helgrind/Makefile.am +++ b/helgrind/Makefile.am @@ -1,5 +1,10 @@ include $(top_srcdir)/Makefile.tool.am +EXTRA_DIST = \ + docs/hg-manual.xml \ + README_MSMProp2.txt \ + README_YARD.txt + #---------------------------------------------------------------------------- # Headers, etc #---------------------------------------------------------------------------- @@ -13,8 +18,6 @@ noinst_HEADERS = \ hg_wordset.h \ libhb.h -EXTRA_DIST = README_MSMProp2.txt README_YARD.txt - #---------------------------------------------------------------------------- # helgrind- #---------------------------------------------------------------------------- diff --git a/helgrind/docs/Makefile.am b/helgrind/docs/Makefile.am deleted file mode 100644 index 84f630f974..0000000000 --- a/helgrind/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = hg-manual.xml diff --git a/lackey/Makefile.am b/lackey/Makefile.am index 6e0aa7a85e..ba38e70482 100644 --- a/lackey/Makefile.am +++ b/lackey/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Makefile.tool.am +EXTRA_DIST = docs/lk-manual.xml + #---------------------------------------------------------------------------- # lackey- #---------------------------------------------------------------------------- diff --git a/lackey/docs/Makefile.am b/lackey/docs/Makefile.am deleted file mode 100644 index 86dc406d9d..0000000000 --- a/lackey/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = lk-manual.xml diff --git a/massif/Makefile.am b/massif/Makefile.am index 65f7d99d6b..bfb54a3836 100644 --- a/massif/Makefile.am +++ b/massif/Makefile.am @@ -2,6 +2,12 @@ include $(top_srcdir)/Makefile.tool.am SUBDIRS += perf +EXTRA_DIST = docs/ms-manual.xml + +#---------------------------------------------------------------------------- +# Headers, etc +#---------------------------------------------------------------------------- + bin_SCRIPTS = ms_print #---------------------------------------------------------------------------- diff --git a/massif/docs/Makefile.am b/massif/docs/Makefile.am deleted file mode 100644 index fc698e9083..0000000000 --- a/massif/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = ms-manual.xml diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am index e521c6ce66..50849c568a 100644 --- a/memcheck/Makefile.am +++ b/memcheck/Makefile.am @@ -2,6 +2,8 @@ include $(top_srcdir)/Makefile.tool.am SUBDIRS += perf +EXTRA_DIST = docs/mc-manual.xml docs/mc-tech-docs.xml + #---------------------------------------------------------------------------- # Headers #---------------------------------------------------------------------------- diff --git a/memcheck/docs/Makefile.am b/memcheck/docs/Makefile.am deleted file mode 100644 index e620710d53..0000000000 --- a/memcheck/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = mc-manual.xml mc-tech-docs.xml diff --git a/none/Makefile.am b/none/Makefile.am index 7cb7e977d5..a1affd3457 100644 --- a/none/Makefile.am +++ b/none/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Makefile.tool.am +EXTRA_DIST = docs/nl-manual.xml + #---------------------------------------------------------------------------- # none- #---------------------------------------------------------------------------- diff --git a/none/docs/Makefile.am b/none/docs/Makefile.am deleted file mode 100644 index 0a59eb10e7..0000000000 --- a/none/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = nl-manual.xml