[gdk-pixbuf] Try harder to fix the continuous build
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] Try harder to fix the continuous build
- Date: Wed, 18 Dec 2013 01:41:15 +0000 (UTC)
commit 00b86ebd80f3fcfd02ae41c5b2a626dbb2c3f427
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Dec 17 20:40:31 2013 -0500
Try harder to fix the continuous build
To use gdk-pixbuf-pixdata uninstalled, we need to use the
uninstalled modules as well, so set GDK_PIXBUF_MODULE_FILE
as well.
tests/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9bbefa2..3d109c5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,9 +54,9 @@ DISTCLEANFILES = resources.h resources.c
EXTRADIST = resources.gresource.xml
resources.h: resources.gresource.xml
- $(AM_V_GEN) GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata
$(GLIB_COMPILE_RESOURCES) $(srcdir)/resources.gresource.xml --target=$@ --sourcedir=$(srcdir)
--generate-header
+ $(AM_V_GEN) GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache
GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata $(GLIB_COMPILE_RESOURCES)
$(srcdir)/resources.gresource.xml --target=$@ --sourcedir=$(srcdir) --generate-header
resources.c: resources.gresource.xml
- $(AM_V_GEN) GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata
$(GLIB_COMPILE_RESOURCES) $(srcdir)/resources.gresource.xml --target=$@ --sourcedir=$(srcdir)
--generate-source
+ $(AM_V_GEN) GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache
GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata $(GLIB_COMPILE_RESOURCES)
$(srcdir)/resources.gresource.xml --target=$@ --sourcedir=$(srcdir) --generate-source
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]