[gedit] Fix generating main resources srcdir != builddir



commit 3a128f103e2f8787fc908846fc733897d5be687e
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Tue Aug 26 19:26:04 2014 +0200

    Fix generating main resources srcdir != builddir

 gedit/Makefile.am |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 2454c4c..9c63b6c 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -232,9 +232,16 @@ gedit/gedit-marshal.c: gedit/gedit-marshal.list $(GLIB_GENMARSHAL)
        $(AM_V_GEN) echo "#include \"gedit-marshal.h\"" > $@ && \
        $(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
 
-gedit_resource_deps = $(call GRESDEPS,gedit/resources/gedit.gresource.xml)
-gedit/gedit-resources.c: $(gedit_resource_deps)
-       $(GRESGEN)
+gedit_resource_deps = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir 
$(srcdir)/gedit/resources --sourcedir $(builddir)/gedit/resources 
$(builddir)/gedit/resources/gedit.gresource.xml)
+
+gedit_resources_c_deps = $(builddir)/gedit/resources/gedit.gresource.xml $(gedit_resource_deps)
+
+gedit/gedit-resources.c: $(gedit_resources_c_deps)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES)                           \
+               --target="$@"                                           \
+               --sourcedir="$(srcdir)/gedit/resources"                 \
+               --sourcedir="$(builddir)/gedit/resources"               \
+               --generate-source "$(builddir)/gedit/resources/gedit.gresource.xml"
 
 if ENABLE_PYTHON
 gedit_overridesdir = $(pyoverridesdir)


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