Putting "dist_" in front of a "_DATA" variable means it is included in "make

dist".  This avoids the need to put it in "EXTRA_DIST", and saves a few lines
in all the docs Makefile.am files.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2614

diff --git a/Makefile.am b/Makefile.am
index 5453784f0954da36f03f66478f82c4441c2ff557..6435b867b37189e2fd4c7fa81a2483fa92d5e69f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ SUPP_FILES = \
        glibc-2.1.supp glibc-2.2.supp glibc-2.3.supp \
        xfree-3.supp xfree-4.supp
 
-val_DATA = $(SUPP_FILES) default.supp
+dist_val_DATA = $(SUPP_FILES) default.supp
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = valgrind.pc
@@ -38,7 +38,7 @@ default.supp: $(SUPP_FILES)
 regtest: check
        @PERL@ tests/vg_regtest --all
 
-EXTRA_DIST = $(val_DATA) \
+EXTRA_DIST = \
        FAQ.txt \
        ACKNOWLEDGEMENTS \
        README_PACKAGERS \

diff --git a/addrcheck/docs/Makefile.am b/addrcheck/docs/Makefile.am
index 6997784200c309ce6e7252b22529c6735748d5b2..6e049abc78669a55f55f3dcc55c3fef053a3146c 100644 (file)
--- a/addrcheck/docs/Makefile.am
+++ b/addrcheck/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = ac_main.html
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = ac_main.html

diff --git a/cachegrind/docs/Makefile.am b/cachegrind/docs/Makefile.am
index c0bfc1ece8e0c4d1bd74071ea91d262995ccc980..9657fe59f03fc36a4f403cd3618e049e7a4e17a7 100644 (file)
--- a/cachegrind/docs/Makefile.am
+++ b/cachegrind/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = cg_main.html cg_techdocs.html 
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = cg_main.html cg_techdocs.html 

diff --git a/corecheck/docs/Makefile.am b/corecheck/docs/Makefile.am
index 5cbe4ef37545b96d977f7d5d0a9792acd9f2cf54..4e4da803f0ec265e1bdc44d9c600c7255b0880b6 100644 (file)
--- a/corecheck/docs/Makefile.am
+++ b/corecheck/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = cc_main.html
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = cc_main.html

diff --git a/coregrind/docs/Makefile.am b/coregrind/docs/Makefile.am
index 9bdfcc020aaae41a74cb19f79a10096560ab9146..27a9e9bf50659f415a8c3ab9e541a8b3580f6f53 100644 (file)
--- a/coregrind/docs/Makefile.am
+++ b/coregrind/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = coregrind_core.html coregrind_intro.html coregrind_tools.html
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = coregrind_core.html coregrind_intro.html coregrind_tools.html

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 53b500e76060cebb63c535844ee9ce1309b04b18..5bb35dc28678be01427135b2114dfa55d4c7c99f 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = manual.html
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = manual.html

diff --git a/helgrind/docs/Makefile.am b/helgrind/docs/Makefile.am
index 08c32b38fca69d90e0628c48a41e40aafa592137..54b4b1bd318dd944dc20b12d3b3796db1c43c478 100644 (file)
--- a/helgrind/docs/Makefile.am
+++ b/helgrind/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = hg_main.html
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = hg_main.html

diff --git a/lackey/docs/Makefile.am b/lackey/docs/Makefile.am
index d11a50bc73ca1d26c7efd5bcd5eb3f981627b96a..4872f334463fe7187f4b8e3cc85ac916c606de7d 100644 (file)
--- a/lackey/docs/Makefile.am
+++ b/lackey/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = lk_main.html
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = lk_main.html

diff --git a/massif/docs/Makefile.am b/massif/docs/Makefile.am
index 11bf87e44ebf918aa690657d4aaea3cebdf79518..a53c352321123220c0e6344ab7eb2a25857b6484 100644 (file)
--- a/massif/docs/Makefile.am
+++ b/massif/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = ms_main.html date.gif
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = ms_main.html date.gif

diff --git a/memcheck/docs/Makefile.am b/memcheck/docs/Makefile.am
index 44229bf514eff881e847fd12f9c183851a9d8580..8d9e7c80e31d094aa62fec703c87b39e0b39e467 100644 (file)
--- a/memcheck/docs/Makefile.am
+++ b/memcheck/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = mc_main.html mc_techdocs.html
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = mc_main.html mc_techdocs.html

diff --git a/none/docs/Makefile.am b/none/docs/Makefile.am
index 4fdc538947ff90dfa40cb8f7de2f7a316e85a835..bbd22965faaa90cd06ae66cbbfbdb6bda5849b14 100644 (file)
--- a/none/docs/Makefile.am
+++ b/none/docs/Makefile.am
@@ -1,5 +1,3 @@
 docdir = $(datadir)/doc/valgrind
 
-doc_DATA = nl_main.html
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = nl_main.html