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 fbc43fdfd63d1f5d60371c87ef7a846e90b10cc9..c35ffc7b8da1bedad91e526ab1b6bb35c46b5634 100644 (file)
--- 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 04c798ec07680be366c3fd9ff136a84da5981a32..fa257f048532c3949a7569a4622135118e6da8e2 100644 (file)
--- 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 (file)
index 8e61709..0000000
--- 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 893cc9c937935f1e9256f7ef18993708f1f2ac80..f512d9a5a39fe5b9941dd21af1cf8d1559886a48 100644 (file)
--- 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 (file)
index 2ed8f30..0000000
--- 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 1a8627fda60413bc4d1f424d29acb627884af172..5c7c7256dbc8cc352c9c70bcfa079b804bb5a42e 100644 (file)
--- 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 (file)
index 35894ff..0000000
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 (file)
index 972b31f..0000000
Binary files a/docs/images/massif-graph.png and /dev/null differ

diff --git a/drd/Makefile.am b/drd/Makefile.am
index 1a21f4d84182252a87caa09836dd40f330009d3d..60c5ce4b9afe58dd736c7149073f103959270a48 100644 (file)
--- 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 (file)
index 9d6f5f4..0000000
--- 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 367d0d4d40c831d533fa8f6eaeb698492cc08bca..aa7f40b4108354c24ef365426225cb3ffb295fd2 100644 (file)
--- 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-<platform>
 #----------------------------------------------------------------------------

diff --git a/exp-bbv/docs/Makefile.am b/exp-bbv/docs/Makefile.am
deleted file mode 100644 (file)
index 734dc54..0000000
--- 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 99ccf60535f31b98f90decc13aabf5c1e9e87fb3..5a9ffa4a17efd3d85b6712d9dc9612ccc075b1b5 100644 (file)
--- 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 (file)
index 60d2880..0000000
--- 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 1266b05409d40ea723896edd2710ce784faa9120..795266a1a73fdb71ec32cebe048dad738b52b310 100644 (file)
--- 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-<platform>
 #----------------------------------------------------------------------------

diff --git a/helgrind/docs/Makefile.am b/helgrind/docs/Makefile.am
deleted file mode 100644 (file)
index 84f630f..0000000
--- 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 6e0aa7a85e767d91024c32d76524fe8516f394b4..ba38e70482f3de278a122122846bfa7830ac149d 100644 (file)
--- 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-<platform>
 #----------------------------------------------------------------------------

diff --git a/lackey/docs/Makefile.am b/lackey/docs/Makefile.am
deleted file mode 100644 (file)
index 86dc406..0000000
--- 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 65f7d99d6bf97a7c1eef7d66bbf8b286f8eead38..bfb54a38369fe2b31a087a6dfb2aeee94c8a012d 100644 (file)
--- 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 (file)
index fc698e9..0000000
--- 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 e521c6ce66c5359e0ee718b874ce014a47abe59f..50849c568ad44526bcb9d9537d93345fe9dc669c 100644 (file)
--- 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 (file)
index e620710..0000000
--- 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 7cb7e977d5573a0f9457f15b7b7c20511a357a5b..a1affd3457e4db521634c6e440637d8b682cb2d0 100644 (file)
--- 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-<platform>
 #----------------------------------------------------------------------------

diff --git a/none/docs/Makefile.am b/none/docs/Makefile.am
deleted file mode 100644 (file)
index 0a59eb1..0000000
--- a/none/docs/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = nl-manual.xml