[yelp] Convert data/icons subdir to non-recursive make

[David King <davidk src gnome org>]

commit 9c26b435d7861870766b787a0dee0cd66ad7e4d2
Author: David King <amigadave amigadave com>
Date:   Tue Oct 20 12:26:56 2015 +0200

    Convert data/icons subdir to non-recursive make

 Makefile.am                                    |   19 +++++++++++++++++++
 configure.ac                                   |    6 ------
 data/Makefile.am                               |    2 +-
 data/icons/Makefile.am                         |    1 -
 data/icons/hicolor/16x16/Makefile.am           |    1 -
 data/icons/hicolor/16x16/status/Makefile.am    |    8 --------
 data/icons/hicolor/Makefile.am                 |    1 -
 data/icons/hicolor/scalable/Makefile.am        |    1 -
 data/icons/hicolor/scalable/status/Makefile.am |   10 ----------
 9 files changed, 20 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5e39b65..22c08ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,6 +107,25 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 gsettings_SCHEMAS = data/org.gnome.yelp.gschema.xml
 @GSETTINGS_RULES@
 
+16icondir = $(pkgdatadir)/icons/hicolor/16x16/status
+scalableicondir = $(pkgdatadir)/icons/hicolor/scalable/status
+
+dist_16icon_DATA = \
+       data/icons/hicolor/16x16/status/bookmark.png \
+       data/icons/hicolor/16x16/status/yelp-page-task.png \
+       data/icons/hicolor/16x16/status/yelp-page-tip.png \
+       data/icons/hicolor/16x16/status/yelp-page-ui.png \
+       data/icons/hicolor/16x16/status/yelp-page-video.png
+
+dist_scalableicon_DATA = \
+       data/icons/hicolor/scalable/status/yelp-page-problem-symbolic.svg \
+       data/icons/hicolor/scalable/status/yelp-page-search-symbolic.svg \
+       data/icons/hicolor/scalable/status/yelp-page-task-symbolic.svg \
+       data/icons/hicolor/scalable/status/yelp-page-tip-symbolic.svg \
+       data/icons/hicolor/scalable/status/yelp-page-ui-symbolic.svg \
+       data/icons/hicolor/scalable/status/yelp-page-video-symbolic.svg \
+       data/icons/hicolor/scalable/status/yelp-page-symbolic.svg
+
 dist_noinst_DATA = \
        $(desktop_in_files) \
        $(gsettings_SCHEMAS) \
diff --git a/configure.ac b/configure.ac
index 478192b..1415bd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,12 +160,6 @@ data/Makefile
 data/domains/Makefile
 data/dtd/Makefile
 data/dtd/catalog
-data/icons/Makefile
-data/icons/hicolor/Makefile
-data/icons/hicolor/16x16/Makefile
-data/icons/hicolor/16x16/status/Makefile
-data/icons/hicolor/scalable/Makefile
-data/icons/hicolor/scalable/status/Makefile
 data/mathjax/Makefile
 data/mathjax/config/Makefile
 data/mathjax/extensions/HTML-CSS/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index c6e5bd0..1ad5efb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = domains dtd icons mathjax xslt
+SUBDIRS = domains dtd mathjax xslt