diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-01-04 15:05:07 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-01-04 15:05:07 +0000 |
| commit | 3b54167d991f134fa8f464e34547c27bcd5d4228 (patch) | |
| tree | 806c57fc9e12fec93d30ff00e37f5dafca90b8a5 /gtk/Makefile.am | |
| parent | 0bf8e61f8ad15b4d1f376596dc1b62159b2afa06 (diff) | |
| download | gtk+-3b54167d991f134fa8f464e34547c27bcd5d4228.tar.gz | |
Cross-compilation fixes. (#392646, Yevgen Muntyan)
2007-01-04 Matthias Clasen <mclasen@redhat.com>
* gtk/Makefile.am:
* gdk-pixbuf/Makefile.am:
* configure.in:
* gdk/win32/rc/gdk.rc.in: Cross-compilation fixes.
(#392646, Yevgen Muntyan)
svn path=/trunk/; revision=17065
Diffstat (limited to 'gtk/Makefile.am')
| -rw-r--r-- | gtk/Makefile.am | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 36ad0292cb..7e5c5c3522 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1116,11 +1116,19 @@ stamp-icons: $(STOCK_ICONS) done \ && touch stamp-icons +if CROSS_COMPILING +gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) +else +gtk_update_icon_cache_program = \ + GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ + ./gtk-update-icon-cache +endif + gtkbuiltincache.h: @REBUILD@ stamp-icons $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) - 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 + $(gtk_update_icon_cache_program) --force --ignore-theme-index \ + --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ + mv gtkbuiltincache.h.tmp gtkbuiltincache.h EXTRA_DIST += \ $(STOCK_ICONS) \ |