summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2013-12-17 20:40:31 -0500
committerMatthias Clasen <mclasen@redhat.com>2013-12-17 20:40:31 -0500
commit00b86ebd80f3fcfd02ae41c5b2a626dbb2c3f427 (patch)
treea280d42a06899717d26ce6f3f7a194f67348e061
parent4016b42384b7bd77685189289fea00914d9e4cde (diff)
downloadgdk-pixbuf-00b86ebd80f3fcfd02ae41c5b2a626dbb2c3f427.tar.gz
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.
-rw-r--r--tests/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9bbefa27a..3d109c52e 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