Convert data/icons subdir to non-recursive make

9 files changed, 20 insertions, 29 deletions

diff --git a/Makefile.am b/Makefile.am
index 5e39b65b..22c08ed4 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 478192bc..1415bd51 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 c6e5bd0a..1ad5efbf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = domains dtd icons mathjax xslt
+SUBDIRS = domains dtd mathjax xslt
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
deleted file mode 100644
index 658356b2..00000000
--- a/data/icons/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = hicolor
diff --git a/data/icons/hicolor/16x16/Makefile.am b/data/icons/hicolor/16x16/Makefile.am
deleted file mode 100644
index d52da2b9..00000000
--- a/data/icons/hicolor/16x16/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = status
diff --git a/data/icons/hicolor/16x16/status/Makefile.am b/data/icons/hicolor/16x16/status/Makefile.am
deleted file mode 100644
index 0d2266fc..00000000
--- a/data/icons/hicolor/16x16/status/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-icondir = $(datadir)/yelp/icons/hicolor/16x16/status
-
-dist_icon_DATA =			\
-	bookmark.png			\
-	yelp-page-task.png		\
-	yelp-page-tip.png		\
-	yelp-page-ui.png		\
-	yelp-page-video.png
diff --git a/data/icons/hicolor/Makefile.am b/data/icons/hicolor/Makefile.am
deleted file mode 100644
index 8197cbd2..00000000
--- a/data/icons/hicolor/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = 16x16 scalable
diff --git a/data/icons/hicolor/scalable/Makefile.am b/data/icons/hicolor/scalable/Makefile.am
deleted file mode 100644
index d52da2b9..00000000
--- a/data/icons/hicolor/scalable/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = status
diff --git a/data/icons/hicolor/scalable/status/Makefile.am b/data/icons/hicolor/scalable/status/Makefile.am
deleted file mode 100644
index 91ec6289..00000000
--- a/data/icons/hicolor/scalable/status/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-icondir = $(datadir)/yelp/icons/hicolor/scalable/status
-
-dist_icon_DATA =			\
-	yelp-page-problem-symbolic.svg	\
-	yelp-page-search-symbolic.svg	\
-	yelp-page-task-symbolic.svg	\
-	yelp-page-tip-symbolic.svg	\
-	yelp-page-ui-symbolic.svg	\
-	yelp-page-video-symbolic.svg	\
-	yelp-page-symbolic.svg