[gjs] build: Fix installed test GResource dependencies



commit 901604875cf490c20a785a854fe7daa6c4b90654
Author: Philip Chimento <philip endlessm com>
Date:   Fri Jun 12 10:02:14 2015 -0700

    build: Fix installed test GResource dependencies
    
    The jsunit binary did not have its dependencies complete; it has a
    GResource compiled into it but the GResource was not properly picking up
    its dependencies due to some incorrect variable names. The generated
    GResource C files also need to be added to BUILT_SOURCES and .gitignore.

 .gitignore           |    2 +-
 Makefile-insttest.am |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a208afd..3401645 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@ installed-tests/gjs-installed-tests
 installed-tests/gjs-installed-tests.testmeta
 jsunit
 jsunit.test
-jsunit-resources.c
+jsunit-resources.[ch]
 testSystemExit.test
 modules-resources.[ch]
 mock-js-resources.[ch]
diff --git a/Makefile-insttest.am b/Makefile-insttest.am
index f454623..9bc6348 100644
--- a/Makefile-insttest.am
+++ b/Makefile-insttest.am
@@ -33,12 +33,13 @@ jsunit_SOURCES = \
        jsunit-resources.c              \
        jsunit-resources.h
 
-jsunit_resources_files = $(shell glib-compile-resources --sourcedir=$(srcdir)/installed-tests/js 
--generate-dependencies $(srcdir)/test/jsunit.gresource.xml)
-jsunit-resources.h: $(srcdir)/installed-tests/js/jsunit.gresources.xml $(jsunit_resource_files)
+jsunit_resources_files := $(shell glib-compile-resources --sourcedir=$(srcdir)/installed-tests/js 
--generate-dependencies $(srcdir)/installed-tests/js/jsunit.gresources.xml)
+jsunit-resources.h: $(srcdir)/installed-tests/js/jsunit.gresources.xml $(jsunit_resources_files)
        $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir)/installed-tests/js 
--sourcedir=$(builddir) --generate --c-name jsunit_resources $<
-jsunit-resources.c: $(srcdir)/installed-tests/js/jsunit.gresources.xml $(jsunit_resource_files)
+jsunit-resources.c: $(srcdir)/installed-tests/js/jsunit.gresources.xml $(jsunit_resources_files)
        $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir)/installed-tests/js 
--sourcedir=$(builddir) --generate --c-name jsunit_resources $<
 
+BUILT_SOURCES += jsunit-resources.h jsunit-resources.c
 CLEANFILES += jsunit-resources.h jsunit-resources.c
 
 privlibdir = $(pkglibdir)


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