[glom] Fix distcheck for gresource files.



commit 04c892f88796a428d33c0bf746057f4ec783fcb3
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 28 18:30:31 2013 +0100

    Fix distcheck for gresource files.

 Makefile.am         |    2 +-
 Makefile_glom.am    |    2 +-
 Makefile_libglom.am |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 528d64c..5e67f29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,7 +231,7 @@ appdata_files = $(appdata_in_files:.xml.in=.xml)
 appdatadir = $(datadir)/appdata
 dist_appdata_DATA = $(appdata_files)
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST += $(appdata_in_files)
 
 @INTLTOOL_XML_RULE@
 
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 1d6b551..9dc41ca 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -30,7 +30,7 @@ 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 = data/glom.gresource.xml
+glom_resource_file = $(top_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))
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_resource_file)
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index 72aefd2..08660b3 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -65,7 +65,7 @@ glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LIBADD = $(libglom_all_libs)
 
 
 # Generate the GResource source file for the xslt files:
-libglom_resource_file = glom/libglom/data/libglom.gresource.xml
+libglom_resource_file = $(top_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))
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(libglom_resource_file)


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