[gtk+] Try to fix the continuous build



commit 6cc5908d88c712ee5faa2618320256af2c23f61f
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jun 13 14:16:37 2014 -0400

    Try to fix the continuous build
    
    Making gtk.gresource.xml generated was causing a problem for
    srcdir!=builddir builds from git. Builds from tarballs are
    not affected, because the tarball contains the generated file.

 gtk/Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index df0460c..b68f5f3 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1418,13 +1418,13 @@ adwaita_sources = \
        resources/theme/Adwaita/assets.txt \
        resources/theme/Adwaita/borders.txt
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies 
$(srcdir)/gtk.gresource.xml)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies 
$(builddir)/gtk.gresource.xml)
 
 gtkresources.h: gtk.gresource.xml
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
                --target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-header --manual-register
 gtkresources.c: gtk.gresource.xml $(resource_files) $(template_headers)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
                --target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-source --manual-register
 
 gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]