Fix building gtkbuiltincache.h without system GTK+.

2006-06-07  Jürg Billeter  <j@bitron.ch>

	* gtk/Makefile.am: Fix building gtkbuiltincache.h without system GTK+.

diff --git a/ChangeLog b/ChangeLog
index b03bd2fac52783ae38aa4e87cdcd983e734b2f80..1f0c5071d58e5be68a66f31ac73a1bf3d3fe4a73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-07  Jürg Billeter  <j@bitron.ch>
+
+       * gtk/Makefile.am: Fix building gtkbuiltincache.h without system GTK+.
+
 2006-06-07  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtk.symbols:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b03bd2fac52783ae38aa4e87cdcd983e734b2f80..1f0c5071d58e5be68a66f31ac73a1bf3d3fe4a73 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2006-06-07  Jürg Billeter  <j@bitron.ch>
+
+       * gtk/Makefile.am: Fix building gtkbuiltincache.h without system GTK+.
+
 2006-06-07  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtk.symbols:

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 136527b9193ef2089ad3e8ab3f0719111576902d..001d0e314d39277ac53d50061df5031ffa949728 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1086,7 +1086,8 @@ stamp-icons: $(STOCK_ICONS)
 
 gtkbuiltincache.h: @REBUILD@ stamp-icons
        $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
-       ./gtk-update-icon-cache --force --ignore-theme-index    \
+       GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders    \
+          ./gtk-update-icon-cache --force --ignore-theme-index                 \
           --source builtin_icons stock-icons > gtkbuiltincache.h
 
 EXTRA_DIST +=                   \