[gnome-terminal] Fix non-srcdir builds
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] Fix non-srcdir builds
- Date: Mon, 5 Feb 2018 10:17:24 +0000 (UTC)
commit 03156bc343b7c72dcc7addf1fa6de3578dfa3cc7
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Feb 5 10:15:03 2018 +0000
Fix non-srcdir builds
If we are including generated files inside a GResource manifest we need
to add $(builddir) to the source directories for glib-compile-resources,
both for the dependency discovery and for the actual generation.
https://bugzilla.gnome.org/show_bug.cgi?id=793179
src/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c02439b..8153331 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -175,8 +175,8 @@ terminal-menubar-with-mnemonics.ui: terminal-menubar.ui.in
terminal-menubar-without-mnemonics.ui: terminal-menubar.ui.in
sed -e 's|<WITH_MNEMONIC>|<!-- |g' -e 's|</WITH_MNEMONIC>| -->|g' -e 's|<WITHOUT_MNEMONIC>||g' -e
's|</WITHOUT_MNEMONIC>||g' $< > $@
-terminal-resources.h terminal-resources.c: terminal.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies --sourcedir $(srcdir) $(srcdir)/terminal.gresource.xml)
- $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate
--c-name terminal $<
+terminal-resources.h terminal-resources.c: terminal.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies --sourcedir $(srcdir) --sourcedir $(builddir) $(srcdir)/terminal.gresource.xml)
+ $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(builddir)
--sourcedir $(srcdir) --generate --c-name terminal $<
# Checks
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]