Use dist_ prefix rather than EXTRA_DIST

46 files changed, 51 insertions, 140 deletions

diff --git a/Makefile.am b/Makefile.am
index 4871b739..f7587639 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,10 +8,12 @@ desktopdir = $(datadir)/applications
 desktop_in_files=yelp.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
-EXTRA_DIST = 						\
-	autogen.sh					\
+dist_noinst_DATA = \
 	$(desktop_in_files)
 
+dist_noinst_SCRIPTS = \
+	autogen.sh
+
 CLEANFILES = $(desktop_DATA)
 
 DISTCHECK_CONFIGURE_FLAGS = \
diff --git a/data/Makefile.am b/data/Makefile.am
index 234e6139..246ce3ab 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,11 +1,8 @@
 SUBDIRS = domains dtd icons mathjax xslt
 
-#This has to be defined, because GSETTINGS_CHECK_RULE adds to it
-MOSTLYCLEANFILES =
-
 @INTLTOOL_SCHEMAS_RULE@
 
 gsettings_SCHEMAS = org.gnome.yelp.gschema.xml
 @GSETTINGS_RULES@
 
-EXTRA_DIST = $(gsettings_SCHEMAS)
+dist_noinst_DATA = $(gsettings_SCHEMAS)
diff --git a/data/domains/Makefile.am b/data/domains/Makefile.am
index 2ea44642..8e57da5b 100644
--- a/data/domains/Makefile.am
+++ b/data/domains/Makefile.am
@@ -15,4 +15,4 @@ xsldir=$(datadir)/yelp-xsl/xslt/common/domains
 
 xsl_DATA = yelp.xml
 
-EXTRA_DIST = yelp.xml.in yelp.xml yelp.pot
+dist_noinst_DATA = yelp.xml.in yelp.xml yelp.pot
diff --git a/data/dtd/Makefile.am b/data/dtd/Makefile.am
index 984979db..a6fa51aa 100644
--- a/data/dtd/Makefile.am
+++ b/data/dtd/Makefile.am
@@ -1,6 +1,6 @@
 dtddir=$(datadir)/yelp/dtd
 
-dtd_DATA =		\
+dist_dtd_DATA = \
 	docbookx.dtd	\
 	isoamsa.ent	\
 	isoamsb.ent	\
@@ -20,7 +20,7 @@ dtd_DATA =		\
 	isolat2.ent	\
 	isonum.ent	\
 	isopub.ent	\
-	isotech.ent	\
-	catalog
+	isotech.ent
 
-EXTRA_DIST = $(dtd_DATA) catalog.in
+dtd_DATA =		\
+	catalog
diff --git a/data/icons/hicolor/16x16/status/Makefile.am b/data/icons/hicolor/16x16/status/Makefile.am
index 1b40ddd7..0d2266fc 100644
--- a/data/icons/hicolor/16x16/status/Makefile.am
+++ b/data/icons/hicolor/16x16/status/Makefile.am
@@ -1,10 +1,8 @@
 icondir = $(datadir)/yelp/icons/hicolor/16x16/status
 
-icon_DATA = 				\
+dist_icon_DATA =			\
 	bookmark.png			\
 	yelp-page-task.png		\
 	yelp-page-tip.png		\
 	yelp-page-ui.png		\
 	yelp-page-video.png
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/hicolor/scalable/status/Makefile.am b/data/icons/hicolor/scalable/status/Makefile.am
index e7901c5f..91ec6289 100644
--- a/data/icons/hicolor/scalable/status/Makefile.am
+++ b/data/icons/hicolor/scalable/status/Makefile.am
@@ -1,6 +1,6 @@
 icondir = $(datadir)/yelp/icons/hicolor/scalable/status
 
-icon_DATA =				\
+dist_icon_DATA =			\
 	yelp-page-problem-symbolic.svg	\
 	yelp-page-search-symbolic.svg	\
 	yelp-page-task-symbolic.svg	\
@@ -8,5 +8,3 @@ icon_DATA =				\
 	yelp-page-ui-symbolic.svg	\
 	yelp-page-video-symbolic.svg	\
 	yelp-page-symbolic.svg
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/data/mathjax/Makefile.am b/data/mathjax/Makefile.am
index 07303322..9d7f4d86 100644
--- a/data/mathjax/Makefile.am
+++ b/data/mathjax/Makefile.am
@@ -2,6 +2,6 @@ SUBDIRS = config extensions fonts/HTML-CSS/TeX/woff jax unpacked
 
 mjdir=$(datadir)/yelp/mathjax
 
-mj_DATA = MathJax.js
+dist_mj_DATA = MathJax.js
 
-EXTRA_DIST = $(mj_DATA) LICENSE README
+dist_noinst_DATA = LICENSE README
diff --git a/data/mathjax/config/Makefile.am b/data/mathjax/config/Makefile.am
index 22508c0f..86a335ef 100644
--- a/data/mathjax/config/Makefile.am
+++ b/data/mathjax/config/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/config
 
-mj_DATA = MMLorHTML.js yelp.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = MMLorHTML.js yelp.js
diff --git a/data/mathjax/extensions/HTML-CSS/Makefile.am b/data/mathjax/extensions/HTML-CSS/Makefile.am
index ecf8a97b..75d98759 100644
--- a/data/mathjax/extensions/HTML-CSS/Makefile.am
+++ b/data/mathjax/extensions/HTML-CSS/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/extensions/HTML-CSS
 
-mj_DATA = handle-floats.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = handle-floats.js
diff --git a/data/mathjax/extensions/Makefile.am b/data/mathjax/extensions/Makefile.am
index 1d7111a7..a0afcef0 100644
--- a/data/mathjax/extensions/Makefile.am
+++ b/data/mathjax/extensions/Makefile.am
@@ -2,10 +2,8 @@ SUBDIRS = HTML-CSS
 
 mjdir=$(datadir)/yelp/mathjax/extensions
 
-mj_DATA =		\
+dist_mj_DATA =		\
 	MathEvents.js	\
 	MathMenu.js	\
 	MathZoom.js	\
 	mml2jax.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/fonts/HTML-CSS/TeX/woff/Makefile.am b/data/mathjax/fonts/HTML-CSS/TeX/woff/Makefile.am
index 8d9d63f4..2646aca3 100644
--- a/data/mathjax/fonts/HTML-CSS/TeX/woff/Makefile.am
+++ b/data/mathjax/fonts/HTML-CSS/TeX/woff/Makefile.am
@@ -1,6 +1,6 @@
 mjdir=$(datadir)/yelp/mathjax/fonts/HTML-CSS/TeX/woff
 
-mj_DATA =					\
+dist_mj_DATA =					\
 	MathJax_AMS-Regular.woff		\
 	MathJax_Caligraphic-Bold.woff		\
 	MathJax_Caligraphic-Regular.woff	\
@@ -21,5 +21,3 @@ mj_DATA =					\
 	MathJax_Size3-Regular.woff		\
 	MathJax_Size4-Regular.woff		\
 	MathJax_Typewriter-Regular.woff
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/element/mml/Makefile.am b/data/mathjax/jax/element/mml/Makefile.am
index 0653c643..94e29be1 100644
--- a/data/mathjax/jax/element/mml/Makefile.am
+++ b/data/mathjax/jax/element/mml/Makefile.am
@@ -2,6 +2,4 @@ SUBDIRS = optable
 
 mjdir=$(datadir)/yelp/mathjax/jax/element/mml
 
-mj_DATA = jax.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = jax.js
diff --git a/data/mathjax/jax/element/mml/optable/Makefile.am b/data/mathjax/jax/element/mml/optable/Makefile.am
index 2fdddba7..e29af196 100644
--- a/data/mathjax/jax/element/mml/optable/Makefile.am
+++ b/data/mathjax/jax/element/mml/optable/Makefile.am
@@ -1,6 +1,6 @@
 mjdir=$(datadir)/yelp/mathjax/jax/element/mml/optable
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	Arrows.js		\
 	BasicLatin.js		\
 	CombDiacritMarks.js	\
@@ -21,5 +21,3 @@ mj_DATA =			\
 	SupplementalArrowsA.js	\
 	SupplementalArrowsB.js	\
 	SuppMathOperators.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/input/MathML/Makefile.am b/data/mathjax/jax/input/MathML/Makefile.am
index de316167..08a17d36 100644
--- a/data/mathjax/jax/input/MathML/Makefile.am
+++ b/data/mathjax/jax/input/MathML/Makefile.am
@@ -2,6 +2,4 @@ SUBDIRS = entities
 
 mjdir=$(datadir)/yelp/mathjax/jax/input/MathML
 
-mj_DATA = config.js jax.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = config.js jax.js
diff --git a/data/mathjax/jax/input/MathML/entities/Makefile.am b/data/mathjax/jax/input/MathML/entities/Makefile.am
index 526e7c7f..a08403f2 100644
--- a/data/mathjax/jax/input/MathML/entities/Makefile.am
+++ b/data/mathjax/jax/input/MathML/entities/Makefile.am
@@ -1,6 +1,6 @@
 mjdir=$(datadir)/yelp/mathjax/jax/input/MathML/entities
 
-mj_DATA =	\
+dist_mj_DATA =	\
 	a.js	\
 	b.js	\
 	c.js	\
@@ -30,5 +30,3 @@ mj_DATA =	\
 	x.js	\
 	y.js	\
 	z.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/Makefile.am b/data/mathjax/jax/output/HTML-CSS/Makefile.am
index 10cc1c31..9044fae2 100644
--- a/data/mathjax/jax/output/HTML-CSS/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/Makefile.am
@@ -2,6 +2,4 @@ SUBDIRS = autoload fonts
 
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS
 
-mj_DATA = config.js jax.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = config.js jax.js
diff --git a/data/mathjax/jax/output/HTML-CSS/autoload/Makefile.am b/data/mathjax/jax/output/HTML-CSS/autoload/Makefile.am
index f8963d03..d440f714 100644
--- a/data/mathjax/jax/output/HTML-CSS/autoload/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/autoload/Makefile.am
@@ -1,6 +1,6 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/autoload
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	annotation-xml.js	\
 	maction.js		\
 	Makefile.am		\
@@ -10,5 +10,3 @@ mj_DATA =			\
 	ms.js			\
 	mtable.js		\
 	multiline.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Makefile.am
index 6c4b17ab..a89f545c 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Makefile.am
@@ -1,6 +1,6 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	Arrows.js		\
 	MathOperators.js	\
 	BBBold.js		\
@@ -21,5 +21,3 @@ mj_DATA =			\
 	GreekAndCoptic.js	\
 	SpacingModLetters.js	\
 	CombDiacritMarks.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Makefile.am
index d04d38b1..1c706422 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Makefile.am
index 777a6171..81b10e65 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Makefile.am
index 3f5ffbcb..84b5bbbe 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Makefile.am
@@ -1,9 +1,7 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold
 
-mj_DATA =		\
+dist_mj_DATA =		\
 	Main.js		\
 	Other.js	\
 	BasicLatin.js	\
 	PUA.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Makefile.am
index afec8862..4b6cf1f8 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Makefile.am
@@ -1,9 +1,7 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular
 
-mj_DATA =		\
+dist_mj_DATA =		\
 	Main.js		\
 	Other.js	\
 	BasicLatin.js	\
 	PUA.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold/Makefile.am
index 4cf4de7d..85f08fd5 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic/Makefile.am
index e2886771..5fe7436c 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic/Makefile.am
index a43c4a3d..93b643b5 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular/Makefile.am
index c588e4a8..390cd352 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Makefile.am
index eee3c88b..a068cd0b 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Makefile.am
@@ -1,6 +1,6 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Bold
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	Arrows.js		\
 	MathOperators.js	\
 	SupplementalArrowsA.js	\
@@ -18,5 +18,3 @@ mj_DATA =			\
 	MiscTechnical.js	\
 	SpacingModLetters.js	\
 	CombDiacritMarks.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Makefile.am
index fb7eb892..979947dc 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Makefile.am
@@ -1,10 +1,8 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Italic
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	Latin1Supplement.js	\
 	Main.js			\
 	LetterlikeSymbols.js	\
 	GeneralPunctuation.js	\
 	CombDiacritMarks.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/Makefile.am
index be9b6a96..8ff30a76 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/Makefile.am
@@ -1,10 +1,8 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Main/Regular
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	Main.js			\
 	GeometricShapes.js	\
 	MiscSymbols.js		\
 	SpacingModLetters.js	\
 	CombDiacritMarks.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Makefile.am
index 408ba7b8..3b00e6f8 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Makefile.am
@@ -25,6 +25,4 @@ SUBDIRS =			\
 
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX
 
-mj_DATA = fontdata-extra.js fontdata.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = fontdata-extra.js fontdata.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic/Makefile.am
index a85f2a77..70f90f9c 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/Italic/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/Italic/Makefile.am
index 90c83f07..9acb8beb 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/Italic/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/Italic/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Math/Italic
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Makefile.am
index 97240e34..37d14aa9 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Makefile.am
@@ -1,9 +1,7 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	Main.js			\
 	Other.js		\
 	BasicLatin.js		\
 	CombDiacritMarks.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Makefile.am
index e15950a7..e4d5c943 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Makefile.am
@@ -1,9 +1,7 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	Main.js			\
 	Other.js		\
 	BasicLatin.js		\
 	CombDiacritMarks.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Makefile.am
index 1c3ffa6f..5f81bf47 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Makefile.am
@@ -1,9 +1,7 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	Main.js			\
 	Other.js		\
 	BasicLatin.js		\
 	CombDiacritMarks.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Makefile.am
index a7563c7a..517b264e 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Script/Regular
 
-mj_DATA = Main.js Other.js BasicLatin.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js Other.js BasicLatin.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular/Makefile.am
index 83a2ec4b..7a7308ec 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular/Makefile.am
index 85e03e10..1ec4252d 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular/Makefile.am
index ebd42f85..e11279ab 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular/Makefile.am
index d1097239..ef5b2535 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular
 
-mj_DATA = Main.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = Main.js
diff --git a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Makefile.am b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Makefile.am
index cc5484ef..5b3257ec 100644
--- a/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Makefile.am
+++ b/data/mathjax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Makefile.am
@@ -1,9 +1,7 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular
 
-mj_DATA =			\
+dist_mj_DATA =			\
 	Main.js			\
 	Other.js		\
 	BasicLatin.js		\
 	CombDiacritMarks.js
-
-EXTRA_DIST = $(mj_DATA)
diff --git a/data/mathjax/jax/output/NativeMML/Makefile.am b/data/mathjax/jax/output/NativeMML/Makefile.am
index 1544815a..8abb46a2 100644
--- a/data/mathjax/jax/output/NativeMML/Makefile.am
+++ b/data/mathjax/jax/output/NativeMML/Makefile.am
@@ -1,5 +1,3 @@
 mjdir=$(datadir)/yelp/mathjax/jax/output/NativeMML
 
-mj_DATA = config.js jax.js
-
-EXTRA_DIST = $(mj_DATA)
+dist_mj_DATA = config.js jax.js
diff --git a/data/mathjax/unpacked/Makefile.am b/data/mathjax/unpacked/Makefile.am
index 3c0954c2..c3eedf49 100644
--- a/data/mathjax/unpacked/Makefile.am
+++ b/data/mathjax/unpacked/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST =									\
+dist_noinst_DATA =									\
 	MathJax.js								\
 	config/MMLorHTML.js							\
 	extensions/HTML-CSS/handle-floats.js					\
diff --git a/data/xslt/Makefile.am b/data/xslt/Makefile.am
index 6afa2326..a49c73c5 100644
--- a/data/xslt/Makefile.am
+++ b/data/xslt/Makefile.am
@@ -6,11 +6,3 @@ xsl_DATA =			\
 	mal2html.xsl		\
 	man2html.xsl		\
 	yelp-common.xsl
-
-EXTRA_DIST=			\
-	$(xsl_DATA)		\
-	db2html.xsl.in		\
-	info2html.xsl.in	\
-	mal2html.xsl.in		\
-	man2html.xsl.in		\
-	yelp-common.xsl.in
diff --git a/docs/libyelp/Makefile.am b/docs/libyelp/Makefile.am
index 915faba8..ac16bab9 100644
--- a/docs/libyelp/Makefile.am
+++ b/docs/libyelp/Makefile.am
@@ -35,8 +35,6 @@ extra_files = version.xml.in
 
 include $(top_srcdir)/gtk-doc.make
 
-EXTRA_DIST += version.xml.in
-
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
 #MKTMPL_OPTIONS=
diff --git a/libyelp/Makefile.am b/libyelp/Makefile.am
index af6f0cbf..8ef53767 100644
--- a/libyelp/Makefile.am
+++ b/libyelp/Makefile.am
@@ -88,7 +88,7 @@ libyelp_la_SOURCES =                \
 	yelp-types.c                \
 	yelp-view.c
 
-EXTRA_DIST =                        \
+dist_noinst_DATA = \
 	yelp-bz2-decompressor.h     \
 	yelp-debug.h                \
 	yelp-error.h                \
@@ -100,14 +100,10 @@ EXTRA_DIST =                        \
 
 if ENABLE_LZMA
 libyelp_la_SOURCES += yelp-lzma-decompressor.c
-else
-EXTRA_DIST += yelp-lzma-decompressor.c
 endif
 
 if ENABLE_BZ2
 libyelp_la_SOURCES += yelp-bz2-decompressor.c
-else
-EXTRA_DIST += yelp-bz2-decompressor.c
 endif
 
 libyelp_la_CFLAGS =                             \