[gtk+/gtk-3-16] Use built-in gtk-update-icon-cache
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc: 
- Subject: [gtk+/gtk-3-16] Use built-in gtk-update-icon-cache
- Date: Fri, 29 May 2015 04:16:20 +0000 (UTC)
commit de93dd85e0a4e272d3da2134d159a0e20ea2bbf1
Author: Cosimo Cecchi <cosimo endlessm com>
Date:   Mon May 18 17:26:25 2015 -0700
    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
 demos/gtk-demo/Makefile.am       |    2 +-
 demos/widget-factory/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 183d109..4b68459 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -173,7 +173,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 9c057ff..b9c481d 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
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]