From eca686f8e0e615f69475a330485c7e23976330a1 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 30 Jul 2002 20:00:16 +0000 Subject: [PATCH] Honor GDK_PIXBUF_CSOURCE from configure.in when cross-compiling. (#87099, Tue Jul 30 15:39:06 2002 Owen Taylor * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from configure.in when cross-compiling. (#87099, J. Ali Harlow) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ demos/Makefile.am | 11 ++++++++--- 7 files changed, 44 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 290e57af3..f4486bec4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 30 15:39:06 2002 Owen Taylor + + * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from + configure.in when cross-compiling. (#87099, + J. Ali Harlow) + Mon Jul 29 16:42:30 2002 Owen Taylor * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 290e57af3..f4486bec4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Jul 30 15:39:06 2002 Owen Taylor + + * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from + configure.in when cross-compiling. (#87099, + J. Ali Harlow) + Mon Jul 29 16:42:30 2002 Owen Taylor * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 290e57af3..f4486bec4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Tue Jul 30 15:39:06 2002 Owen Taylor + + * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from + configure.in when cross-compiling. (#87099, + J. Ali Harlow) + Mon Jul 29 16:42:30 2002 Owen Taylor * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 290e57af3..f4486bec4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Jul 30 15:39:06 2002 Owen Taylor + + * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from + configure.in when cross-compiling. (#87099, + J. Ali Harlow) + Mon Jul 29 16:42:30 2002 Owen Taylor * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 290e57af3..f4486bec4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Jul 30 15:39:06 2002 Owen Taylor + + * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from + configure.in when cross-compiling. (#87099, + J. Ali Harlow) + Mon Jul 29 16:42:30 2002 Owen Taylor * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 290e57af3..f4486bec4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Jul 30 15:39:06 2002 Owen Taylor + + * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from + configure.in when cross-compiling. (#87099, + J. Ali Harlow) + Mon Jul 29 16:42:30 2002 Owen Taylor * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding): diff --git a/demos/Makefile.am b/demos/Makefile.am index 2230a8130..9f14cca8b 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -32,11 +32,16 @@ noinst_PROGRAMS = \ testpixbuf-scale \ pixbuf-demo -test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource$(EXEEXT) apple-red.png gnome-foot.png +if CROSS_COMPILING +pixbuf_csource=$(GDK_PIXBUF_CSOURCE) +else +pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource +endif + +test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png (topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \ cd $(srcdir) && \ - GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs \ - $$topdir/gdk-pixbuf/gdk-pixbuf-csource --build-list \ + $(pixbuf_csource) --build-list \ apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h) testpixbuf_DEPENDENCIES = $(DEPS)