[seed] jsextensions: sanitize and make make distcheck pass



commit 7105800a45680fae3825b8c30158b0fafbd85d64
Author: Mathieu Duponchelle <mathieu duponchelle opencreed com>
Date:   Fri Sep 16 00:22:30 2016 +0200

    jsextensions: sanitize and make make distcheck pass
    
    .. in that directory, there are other errors in other places.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771510

 configure.ac             |    7 ++++++
 jsextensions/Makefile.am |   50 +++++++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b468285..8d68e2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,6 +399,13 @@ fi
 AM_CONDITIONAL(BUILD_MPFR_MODULE, test "x$want_mpfr_module" = "xyes")
 AC_SUBST(BUILD_MPFR_MODULE)
 
+dnl ==== glib-compile-resources ====
+
+AC_PATH_PROG([GLIB_COMPILE_RESOURCES],[glib-compile-resources])
+AS_IF([test "$GLIB_COMPILE_RESOURCES" == ""],[
+       AC_MSG_ERROR([glib-compile-resources not found])
+])
+
 dnl ===========================Profiling=======================================
 AC_ARG_ENABLE(profile,
                          AC_HELP_STRING([--enable-profile],
diff --git a/jsextensions/Makefile.am b/jsextensions/Makefile.am
index 769fe02..48ca7a5 100644
--- a/jsextensions/Makefile.am
+++ b/jsextensions/Makefile.am
@@ -1,30 +1,36 @@
-GLIB_COMPILE_RESOURCES=glib-compile-resources
-js_files=Clutter.js \
-          gjs/Gtk.js \
-          gjs/GObject.js \
-          gjs/Gio.js \
-          gjs/GLib.js \
-          GObject.js \
-          Gio.js \
-          Gst.js \
-          GLib.js \
-          Gtk.js \
-          repl.js
+js_files = \
+       Clutter.js \
+       gjs/Gtk.js \
+       gjs/GObject.js \
+       gjs/Gio.js \
+       gjs/GLib.js \
+       GObject.js \
+       Gio.js \
+       Gst.js \
+       GLib.js \
+       Gtk.js \
+       repl.js \
+       $(NULL)
 
-resources=$(js_files) \
-                 Seed.js
+resources = \
+       $(js_files) \
+       Seed.js \
+       $(NULL)
 
 Seed.js: Seed.js.in
        $(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)@SEED_GTK_VERSION@|" -e 
"s|%pkgdatadir%|$(pkgdatadir)@SEED_GTK_VERSION@|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@
 
-libseed-resources.c: libseed.gresources.xml Seed.js.in $(resources)
-       $(GLIB_COMPILE_RESOURCES) libseed.gresources.xml --target=$@ --sourcedir=. --generate-source
+libseed-resources.c: libseed.gresources.xml Seed.js $(resources)
+       $(GLIB_COMPILE_RESOURCES) $(top_srcdir)/jsextensions/libseed.gresources.xml --target=$@ 
--sourcedir=$(top_srcdir)/jsextensions --sourcedir=. --generate-source
 
-all: libseed-resources.c
+BUILT_SOURCES = \
+       libseed-resources.c \
+       Seed.js \
+       $(NULL)
 
-clean:
-       rm libseed-resources.c
+CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = libseed.gresources.xml \
-                        Seed.js.in \
-                        $(js_files)
+EXTRA_DIST = \
+       libseed.gresources.xml \
+       Seed.js.in \
+       $(js_files)


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