[gnome-maps] build: Make sure we generate path/config.js



commit 192406221c2f161900b904bfba43b64cf3e48a17
Author: Jonas Danielsson <jonas danielsson threetimestwo org>
Date:   Mon Sep 8 04:11:37 2014 -0400

    build: Make sure we generate path/config.js
    
    This tries to fix parallel builds fails making GResource generated files for JS
    files depends on path.js and config.js, so we ensure that these files are
    properly generated before generate the GResource source files.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=734507

 src/Makefile-js.am |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/Makefile-js.am b/src/Makefile-js.am
index 3737997..5764c34 100644
--- a/src/Makefile-js.am
+++ b/src/Makefile-js.am
@@ -7,11 +7,10 @@ path.js: Makefile path.js.in
 config.js: Makefile config.js.in
        $(AM_V_GEN) $(do_subst) $(srcdir)/config.js.in > $(builddir)/config.js
 
-js_files = $(shell $(GLIB_COMPILE_RESOURCES)                           \
-               --sourcedir=$(srcdir)                                   \
-               --generate-dependencies $(srcdir)/gnome-maps.js.gresource.xml)
+.PHONY: generated-sources
+generated-sources: path.js config.js
 
-gnome-maps-js.h: gnome-maps.js.gresource.xml $(js_files)
+gnome-maps-js.h: gnome-maps.js.gresource.xml generated-sources
        $(AM_V_GEN)                                                     \
                $(GLIB_COMPILE_RESOURCES)                               \
                --target=$@                                             \
@@ -19,7 +18,8 @@ gnome-maps-js.h: gnome-maps.js.gresource.xml $(js_files)
                --sourcedir=$(builddir)                                 \
                --generate                                              \
                --c-name gnome_maps_js $<
-gnome-maps-js.c: gnome-maps.js.gresource.xml $(js_files)
+
+gnome-maps-js.c: gnome-maps.js.gresource.xml generated-sources
        $(AM_V_GEN) \
                $(GLIB_COMPILE_RESOURCES)                               \
                --target=$@                                             \
@@ -37,6 +37,6 @@ CLEANFILES +=                                                         \
 
 EXTRA_DIST +=                                                          \
        gnome-maps.js.gresource.xml                                     \
-       $(filter-out $(BUILT_SOURCES),$(subst ./,,$(js_files)))         \
+       $(filter-out $(BUILT_SOURCES),$(subst ./,,$(wildcard *.js)))    \
        path.js.in                                                      \
        config.js.in


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