|
From: <sv...@va...> - 2009-08-05 08:08:30
|
Author: njn
Date: 2009-08-05 09:08:18 +0100 (Wed, 05 Aug 2009)
New Revision: 10721
Log:
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!
Removed:
trunk/cachegrind/docs/Makefile.am
trunk/callgrind/docs/Makefile.am
trunk/docs/images/massif-graph-sm.png
trunk/docs/images/massif-graph.png
trunk/drd/docs/Makefile.am
trunk/exp-bbv/docs/Makefile.am
trunk/exp-ptrcheck/docs/Makefile.am
trunk/helgrind/docs/Makefile.am
trunk/lackey/docs/Makefile.am
trunk/massif/docs/Makefile.am
trunk/memcheck/docs/Makefile.am
trunk/none/docs/Makefile.am
Modified:
trunk/Makefile.tool.am
trunk/cachegrind/Makefile.am
trunk/callgrind/Makefile.am
trunk/configure.in
trunk/drd/Makefile.am
trunk/exp-bbv/Makefile.am
trunk/exp-ptrcheck/Makefile.am
trunk/helgrind/Makefile.am
trunk/lackey/Makefile.am
trunk/massif/Makefile.am
trunk/memcheck/Makefile.am
trunk/none/Makefile.am
Modified: trunk/Makefile.tool.am
===================================================================
--- trunk/Makefile.tool.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/Makefile.tool.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1,5 +1,5 @@
-SUBDIRS = . tests docs
+SUBDIRS = . tests
include $(top_srcdir)/Makefile.all.am
Modified: trunk/cachegrind/Makefile.am
===================================================================
--- trunk/cachegrind/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/cachegrind/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.tool.am
+EXTRA_DIST = docs/cg-manual.xml
+
#----------------------------------------------------------------------------
# Headers, etc
#----------------------------------------------------------------------------
Deleted: trunk/cachegrind/docs/Makefile.am
===================================================================
--- trunk/cachegrind/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/cachegrind/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1 +0,0 @@
-EXTRA_DIST = cg-manual.xml
Modified: trunk/callgrind/Makefile.am
===================================================================
--- trunk/callgrind/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/callgrind/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -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
#----------------------------------------------------------------------------
Deleted: trunk/callgrind/docs/Makefile.am
===================================================================
--- trunk/callgrind/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/callgrind/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1,7 +0,0 @@
-EXTRA_DIST = \
- cl-entities.xml \
- cl-manual.xml \
- cl-format.xml \
- man-annotate.xml \
- man-control.xml \
- man-callgrind.xml
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/configure.in 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1858,28 +1858,22 @@
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 @@
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
Deleted: trunk/docs/images/massif-graph-sm.png
===================================================================
(Binary files differ)
Deleted: trunk/docs/images/massif-graph.png
===================================================================
(Binary files differ)
Modified: trunk/drd/Makefile.am
===================================================================
--- trunk/drd/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/drd/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.tool.am
+EXTRA_DIST = docs/drd-manual.xml
+
#----------------------------------------------------------------------------
# Headers, flags
#----------------------------------------------------------------------------
Deleted: trunk/drd/docs/Makefile.am
===================================================================
--- trunk/drd/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/drd/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1 +0,0 @@
-EXTRA_DIST = drd-manual.xml
Modified: trunk/exp-bbv/Makefile.am
===================================================================
--- trunk/exp-bbv/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/exp-bbv/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.tool.am
+EXTRA_DIST = docs/bbv-manual.xml
+
#----------------------------------------------------------------------------
# exp-bbv-<platform>
#----------------------------------------------------------------------------
Deleted: trunk/exp-bbv/docs/Makefile.am
===================================================================
--- trunk/exp-bbv/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/exp-bbv/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1,2 +0,0 @@
-EXTRA_DIST = bbv-manual.xml
-
Modified: trunk/exp-ptrcheck/Makefile.am
===================================================================
--- trunk/exp-ptrcheck/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/exp-ptrcheck/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.tool.am
+EXTRA_DIST = docs/pc-manual.xml
+
#----------------------------------------------------------------------------
# Headers, etc
#----------------------------------------------------------------------------
Deleted: trunk/exp-ptrcheck/docs/Makefile.am
===================================================================
--- trunk/exp-ptrcheck/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/exp-ptrcheck/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1 +0,0 @@
-EXTRA_DIST = pc-manual.xml
Modified: trunk/helgrind/Makefile.am
===================================================================
--- trunk/helgrind/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/helgrind/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -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 @@
hg_wordset.h \
libhb.h
-EXTRA_DIST = README_MSMProp2.txt README_YARD.txt
-
#----------------------------------------------------------------------------
# helgrind-<platform>
#----------------------------------------------------------------------------
Deleted: trunk/helgrind/docs/Makefile.am
===================================================================
--- trunk/helgrind/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/helgrind/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1 +0,0 @@
-EXTRA_DIST = hg-manual.xml
Modified: trunk/lackey/Makefile.am
===================================================================
--- trunk/lackey/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/lackey/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.tool.am
+EXTRA_DIST = docs/lk-manual.xml
+
#----------------------------------------------------------------------------
# lackey-<platform>
#----------------------------------------------------------------------------
Deleted: trunk/lackey/docs/Makefile.am
===================================================================
--- trunk/lackey/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/lackey/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1 +0,0 @@
-EXTRA_DIST = lk-manual.xml
Modified: trunk/massif/Makefile.am
===================================================================
--- trunk/massif/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/massif/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -2,6 +2,12 @@
SUBDIRS += perf
+EXTRA_DIST = docs/ms-manual.xml
+
+#----------------------------------------------------------------------------
+# Headers, etc
+#----------------------------------------------------------------------------
+
bin_SCRIPTS = ms_print
#----------------------------------------------------------------------------
Deleted: trunk/massif/docs/Makefile.am
===================================================================
--- trunk/massif/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/massif/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1 +0,0 @@
-EXTRA_DIST = ms-manual.xml
Modified: trunk/memcheck/Makefile.am
===================================================================
--- trunk/memcheck/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/memcheck/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -2,6 +2,8 @@
SUBDIRS += perf
+EXTRA_DIST = docs/mc-manual.xml docs/mc-tech-docs.xml
+
#----------------------------------------------------------------------------
# Headers
#----------------------------------------------------------------------------
Deleted: trunk/memcheck/docs/Makefile.am
===================================================================
--- trunk/memcheck/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/memcheck/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1 +0,0 @@
-EXTRA_DIST = mc-manual.xml mc-tech-docs.xml
Modified: trunk/none/Makefile.am
===================================================================
--- trunk/none/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/none/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.tool.am
+EXTRA_DIST = docs/nl-manual.xml
+
#----------------------------------------------------------------------------
# none-<platform>
#----------------------------------------------------------------------------
Deleted: trunk/none/docs/Makefile.am
===================================================================
--- trunk/none/docs/Makefile.am 2009-08-05 07:39:45 UTC (rev 10720)
+++ trunk/none/docs/Makefile.am 2009-08-05 08:08:18 UTC (rev 10721)
@@ -1 +0,0 @@
-EXTRA_DIST = nl-manual.xml
|