[empathy] chat-resources: Fix dependencies generation on $(srcdir) != $(builddir)
- From: Emanuele Aina <emaaa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] chat-resources: Fix dependencies generation on $(srcdir) != $(builddir)
- Date: Mon, 1 Apr 2013 10:40:04 +0000 (UTC)
commit 41d2d42c2461e9577f4b8802828e505bf49d1f32
Author: Emanuele Aina <emanuele aina collabora com>
Date: Mon Apr 1 11:48:00 2013 +0200
chat-resources: Fix dependencies generation on $(srcdir) != $(builddir)
`glib-compile-resources generate-dependencies' needs the --sourcedir
flag to be able to work properly when $(srcdir) != $(builddir).
Spotted by running `make distcheck'.
src/Makefile.am | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 0766d95..db30af3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -207,14 +207,10 @@ BUILT_SOURCES = \
CLEANFILES = $(BUILT_SOURCES)
-empathy-chat-resources.c: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
- --sourcedir=$(srcdir) \
- --generate-source \
- $<
-
-empathy-chat-resources.h: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
- --sourcedir=$(srcdir) \
- --generate-header \
- $<
+chat_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir)
$(srcdir)/empathy-chat.gresource.xml)
+
+empathy-chat-resources.c: empathy-chat.gresource.xml $(chat_resource_files)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+empathy-chat-resources.h: empathy-chat.gresource.xml $(chat_resource_files)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]