From 73e0984242aba198e1e8da425f59acf5c188f69c Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 4 Oct 2002 16:17:29 +0000 Subject: [PATCH] Fix envars for uninstalled operation of gdk-pixbuf Fri Oct 4 12:05:27 2002 Owen Taylor * demos/Makefile.am (pixbuf_csource): Fix envars for uninstalled operation of gdk-pixbuf * demos/Makefile.am (test-inline-pixbufs.h): Remove output on failure. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ demos/Makefile.am | 4 ++-- 7 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 558aa84453..c0aeadd5a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Oct 4 12:05:27 2002 Owen Taylor + + * demos/Makefile.am (pixbuf_csource): Fix envars + for uninstalled operation of gdk-pixbuf + + * demos/Makefile.am (test-inline-pixbufs.h): Remove + output on failure. + Fri Oct 4 12:00:10 2002 Owen Taylor * gdk/gdkscreen.c (gdk_screen_class_init): Get the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 558aa84453..c0aeadd5a4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Fri Oct 4 12:05:27 2002 Owen Taylor + + * demos/Makefile.am (pixbuf_csource): Fix envars + for uninstalled operation of gdk-pixbuf + + * demos/Makefile.am (test-inline-pixbufs.h): Remove + output on failure. + Fri Oct 4 12:00:10 2002 Owen Taylor * gdk/gdkscreen.c (gdk_screen_class_init): Get the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 558aa84453..c0aeadd5a4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Fri Oct 4 12:05:27 2002 Owen Taylor + + * demos/Makefile.am (pixbuf_csource): Fix envars + for uninstalled operation of gdk-pixbuf + + * demos/Makefile.am (test-inline-pixbufs.h): Remove + output on failure. + Fri Oct 4 12:00:10 2002 Owen Taylor * gdk/gdkscreen.c (gdk_screen_class_init): Get the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 558aa84453..c0aeadd5a4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Fri Oct 4 12:05:27 2002 Owen Taylor + + * demos/Makefile.am (pixbuf_csource): Fix envars + for uninstalled operation of gdk-pixbuf + + * demos/Makefile.am (test-inline-pixbufs.h): Remove + output on failure. + Fri Oct 4 12:00:10 2002 Owen Taylor * gdk/gdkscreen.c (gdk_screen_class_init): Get the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 558aa84453..c0aeadd5a4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Fri Oct 4 12:05:27 2002 Owen Taylor + + * demos/Makefile.am (pixbuf_csource): Fix envars + for uninstalled operation of gdk-pixbuf + + * demos/Makefile.am (test-inline-pixbufs.h): Remove + output on failure. + Fri Oct 4 12:00:10 2002 Owen Taylor * gdk/gdkscreen.c (gdk_screen_class_init): Get the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 558aa84453..c0aeadd5a4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Fri Oct 4 12:05:27 2002 Owen Taylor + + * demos/Makefile.am (pixbuf_csource): Fix envars + for uninstalled operation of gdk-pixbuf + + * demos/Makefile.am (test-inline-pixbufs.h): Remove + output on failure. + Fri Oct 4 12:00:10 2002 Owen Taylor * gdk/gdkscreen.c (gdk_screen_class_init): Get the diff --git a/demos/Makefile.am b/demos/Makefile.am index a638c60393..3a81a2d1e6 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -35,14 +35,14 @@ noinst_PROGRAMS = \ if CROSS_COMPILING pixbuf_csource=$(GDK_PIXBUF_CSOURCE) else -pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource +pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$$topdir/gdk-pixbuf/gdk-pixbuf.loaders $$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) && \ $(pixbuf_csource) --build-list \ - apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h) + apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h || (rm -f $$curdir/test-inline-pixbufs.h && false)) testpixbuf_DEPENDENCIES = $(DEPS) testpixbuf_drawable_DEPENDENCIES = $(DEPS)