[gdk-pixbuf] Try to fix the continuous build
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] Try to fix the continuous build
- Date: Wed, 18 Dec 2013 01:25:22 +0000 (UTC)
commit 4016b42384b7bd77685189289fea00914d9e4cde
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Dec 17 20:24:21 2013 -0500
Try to fix the continuous build
We are using to-pixdata processing for some of the resources
in tests/, but gdk-pixbuf-pixdata has not been installed on
the system yet. So pass the location of the just-built one
via the GDK_PIXBUF_PIXDATA env var.
tests/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ca82836..9bbefa2 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) $(GLIB_COMPILE_RESOURCES) $(srcdir)/resources.gresource.xml --target=$@
--sourcedir=$(srcdir) --generate-header
+ $(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
resources.c: resources.gresource.xml
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/resources.gresource.xml --target=$@
--sourcedir=$(srcdir) --generate-source
+ $(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
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]