summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimo@endlessm.com>2015-05-18 17:26:25 -0700
committerCosimo Cecchi <cosimoc@gnome.org>2015-05-24 12:08:33 -0700
commit345f2a484b6d70fcdb2cd861fc66cca9c8c6f493 (patch)
treee823ef18e892115042d7351e72d7eeeddf40a114 /demos
parent02be88983eb700ac5524b5530ef64244ece7a0ec (diff)
downloadgtk+-345f2a484b6d70fcdb2cd861fc66cca9c8c6f493.tar.gz
Use built-in gtk-update-icon-cache
To generate the icon cache files. We want to avoid a dependency loop if possible; additionally, on some Debian-based systems gtk-update-icon-cache maps to the GTK2 version of the utility and the GTK3 version is renamed to gtk-update-icon-cache-3.0. To avoid a build dependency on GTK2, use the binary that we just built in-tree. https://bugzilla.gnome.org/show_bug.cgi?id=749593
Diffstat (limited to 'demos')
-rw-r--r--demos/gtk-demo/Makefile.am2
-rw-r--r--demos/widget-factory/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 19c3abfdc0..43cba929f2 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -214,7 +214,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
-update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
+update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache --ignore-theme-index --force
install-data-hook: install-update-icon-cache
uninstall-hook: uninstall-update-icon-cache
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
index 9c057ff8bc..b9c481da6e 100644
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
-update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
+update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache --ignore-theme-index --force
install-data-hook: install-update-icon-cache
uninstall-hook: uninstall-update-icon-cache