[gnome-maps] Revert "Build: Fix make rules for parallel build"

[Jonas Danielsson <jonasdn src gnome org>]

commit 8c631e737a8de159ecb145125d5553aabb4746f4
Author: Jonas Danielsson <jonas threetimestwo org>
Date:   Mon Sep 1 21:47:23 2014 +0200

    Revert "Build: Fix make rules for parallel build"
    
    This reverts commit 08423c2943c2bc73688a7ee1acb5c3508a0b6f7a.

 configure.ac       |    2 --
 src/Makefile-js.am |   19 ++++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 406b9ab..cb9d245 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,5 @@ AC_CONFIG_FILES([
     data/org.gnome.Maps.desktop.in
     data/icons/Makefile
     po/Makefile.in
-    src/config.js
-    src/path.js
 ])
 AC_OUTPUT
diff --git a/src/Makefile-js.am b/src/Makefile-js.am
index f237ef0..3737997 100644
--- a/src/Makefile-js.am
+++ b/src/Makefile-js.am
@@ -1,4 +1,17 @@
-gnome-maps-js.h: gnome-maps.js.gresource.xml
+BUILT_SOURCES +=                                                       \
+       path.js                                                         \
+       config.js
+
+path.js: Makefile path.js.in
+       $(AM_V_GEN) $(do_subst) $(srcdir)/path.js.in > $(builddir)/path.js
+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)
+
+gnome-maps-js.h: gnome-maps.js.gresource.xml $(js_files)
        $(AM_V_GEN)                                                     \
                $(GLIB_COMPILE_RESOURCES)                               \
                --target=$@                                             \
@@ -6,7 +19,7 @@ gnome-maps-js.h: gnome-maps.js.gresource.xml
                --sourcedir=$(builddir)                                 \
                --generate                                              \
                --c-name gnome_maps_js $<
-gnome-maps-js.c: gnome-maps.js.gresource.xml
+gnome-maps-js.c: gnome-maps.js.gresource.xml $(js_files)
        $(AM_V_GEN) \
                $(GLIB_COMPILE_RESOURCES)                               \
                --target=$@                                             \
@@ -24,6 +37,6 @@ CLEANFILES +=                                                         \
 
 EXTRA_DIST +=                                                          \
        gnome-maps.js.gresource.xml                                     \
-       $(filter-out $(BUILT_SOURCES),$(wildcard $(srcdir)/*.js))       \
+       $(filter-out $(BUILT_SOURCES),$(subst ./,,$(js_files)))         \
        path.js.in                                                      \
        config.js.in