From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Wed, 25 Aug 2004 11:40:07 +0000 (+0000)
Subject: Putting "dist_" in front of a "_DATA" variable means it is included in "make
X-Git-Tag: svn/VALGRIND_2_2_0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db27515b199f1ac59e94c123857e86611ab17a2;p=thirdparty%2Fvalgrind.git

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 5453784f09..6435b867b3 100644
--- 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 6997784200..6e049abc78 100644
--- 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 c0bfc1ece8..9657fe59f0 100644
--- 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 5cbe4ef375..4e4da803f0 100644
--- 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 9bdfcc020a..27a9e9bf50 100644
--- 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 53b500e760..5bb35dc286 100644
--- 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 08c32b38fc..54b4b1bd31 100644
--- 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 d11a50bc73..4872f33446 100644
--- 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 11bf87e44e..a53c352321 100644
--- 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 44229bf514..8d9e7c80e3 100644
--- 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 4fdc538947..bbd22965fa 100644
--- 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