[glom] GResource building: Fixes for builddir!=srcdir.



commit 4bd522c04818b2f015d27f1137f495dc1eccfb5e
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 29 11:18:45 2013 +0100

    GResource building: Fixes for builddir!=srcdir.

 Makefile_glom.am    |    8 ++++----
 Makefile_libglom.am |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 9dc41ca..a936831 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -30,15 +30,15 @@ glom_glom_CPPFLAGS = $(glom_includes) $(GLOM_CFLAGS) $(PYTHON_CPPFLAGS) $(BOOST_
 
 # Generate the GResource source file for .glade and icons files:
 # TODO: Do not use all .glade files in the client-only build.
-glom_resource_file = $(top_srcdir)/data/glom.gresource.xml
+glom_resource_file = $(srcdir)/data/glom.gresource.xml
 BUILT_SOURCES += data/glom-resources.c
-data/glom-resources.c: $(glom_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
$(glom_resource_file))
+data/glom-resources.c: $(glom_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(glom_resource_file))
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_resource_file)
 
 # Generate the GResource source file for example .glom files:
-glom_examples_resource_file = examples/glom-examples.gresource.xml
+glom_examples_resource_file = $(srcdir)/examples/glom-examples.gresource.xml
 BUILT_SOURCES += examples/glom-examples-resources.c
-examples/glom-examples-resources.c: $(glom_examples_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies $(glom_examples_resource_file))
+examples/glom-examples-resources.c: $(glom_examples_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--sourcedir=$(srcdir) --generate-dependencies $(glom_examples_resource_file))
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_examples_resource_file)
 
 EXTRA_DIST += \
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index 08660b3..e0a668d 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -65,9 +65,9 @@ glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LIBADD = $(libglom_all_libs)
 
 
 # Generate the GResource source file for the xslt files:
-libglom_resource_file = $(top_srcdir)/glom/libglom/data/libglom.gresource.xml
+libglom_resource_file = $(srcdir)/glom/libglom/data/libglom.gresource.xml
 BUILT_SOURCES = glom/libglom/data/libglom-resources.c
-glom/libglom/data/libglom-resources.c: $(libglom_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies $(libglom_resource_file))
+glom/libglom/data/libglom-resources.c: $(libglom_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--sourcedir=$(srcdir) --generate-dependencies $(libglom_resource_file))
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(libglom_resource_file)
 
 EXTRA_DIST = \


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