[epiphany] Reduce unnecessary use of EXTRA_DIST

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 1da084937d4ef9fac279d2ed1b434d8ccdc6e49d
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Aug 7 17:05:07 2016 -0500

    Reduce unnecessary use of EXTRA_DIST

 data/Makefile.am       |   11 +++--------
 data/pages/Makefile.am |    4 +---
 doc/Makefile.am        |   10 +++-------
 src/Makefile.am        |    2 +-
 tests/Makefile.am      |    2 +-
 tests/data/Makefile.am |    2 +-
 6 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 1f49cf9..60a2466 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,13 +22,13 @@ appstream_XML = $(appstream_in_files:.xml.in=.xml)
 @APPSTREAM_XML_RULES@
 
 aboutdialogdir = $(pkgdatadir)
-aboutdialog_DATA = about.ini
+dist_aboutdialog_DATA = about.ini
 
 mimepermissiondir = $(pkgdatadir)
-mimepermission_DATA = mime-types-permissions.xml
+dist_mimepermission_DATA = mime-types-permissions.xml
 
 xsldir = $(pkgdatadir)
-xsl_DATA = \
+dist_xsl_DATA = \
        epiphany-bookmarks-html.xsl
 
 # Dbus service file
@@ -56,14 +56,9 @@ searchproviderdir = $(datadir)/gnome-shell/search-providers
 dist_searchprovider_DATA = epiphany-search-provider.ini
 
 EXTRA_DIST = \
-       $(aboutdialog_DATA)             \
        $(appstream_in_files)           \
        $(service_in_files)             \
        $(desktop_in_files)             \
-       $(about_DATA)                   \
-       $(mimepermission_DATA)          \
-       $(xsl_DATA)                     \
-       $(service_in_files)             \
        $(default_bookmarks_in_files)   \
        $(gsettings_SCHEMAS)            \
        $(convert_DATA)                 \
diff --git a/data/pages/Makefile.am b/data/pages/Makefile.am
index f1a9f5a..7cb72f8 100644
--- a/data/pages/Makefile.am
+++ b/data/pages/Makefile.am
@@ -1,7 +1,5 @@
 stylepagesdir = $(pkgdatadir)/pages
-stylepages_DATA = \
+dist_stylepages_DATA = \
        error.css
 
-EXTRA_DIST = $(stylepages_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c6f4c6e..73aabf6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,7 @@
-NULL =
+dist_man_MANS = epiphany.1
 
-man_MANS = epiphany.1
-
-EXTRA_DIST =           \
-       $(man_MANS)     \
+dist_noinst_DATA = \
        bookmarks.txt   \
-       debugging.txt   \
-       $(NULL)
+       debugging.txt
 
 -include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index c207557..408343d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libephymain.la
 
 bin_PROGRAMS = epiphany
 
-EXTRA_DIST = \
+dist_noinst_DATA = \
        org.gnome.ShellSearchProvider2.xml \
        epiphany.gresource.xml \
        $(RESOURCE_FILES)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d581b1f..1def013 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -191,7 +191,7 @@ test_ephy_web_view_SOURCES = \
        $(top_builddir)/src/epiphany-resources.c \
        ephy-web-view-test.c
 
-EXTRA_DIST = \
+dist_noinst_DATA = \
        data/test.html \
        applications/epiphany.desktop \
        applications/defaults.list
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index fdc55a6..e57e6f4 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1,3 +1,3 @@
-EXTRA_DIST = user-dirs.dirs
+dist_noinst_DATA = user-dirs.dirs
 
 -include $(top_srcdir)/git.mk