[gnome-battery-bench] Fix out-of-source builds
- From: Christian Kellner <gicmo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-battery-bench] Fix out-of-source builds
- Date: Fri, 13 Jan 2017 10:00:34 +0000 (UTC)
commit 2515ed274ae6097bc6efae0f969fc5982c128e22
Author: Christian Kellner <gicmo gnome org>
Date: Mon Dec 12 17:16:08 2016 +0100
Fix out-of-source builds
The autogen.sh called autoconf and friends in the current working
directory and therfore couldn't find the neccessary files.
Additionally for the proper generation of gnome-battery-bench.c
we need to include the actual source dir as an source directory.
https://bugzilla.gnome.org/show_bug.cgi?id=775995
autogen.sh | 5 +++++
src/Makefile.am | 5 ++++-
2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index dbefa38..71b42f7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,6 +8,9 @@ test -z "$srcdir" && srcdir=.
exit 1
}
+olddir=`pwd`
+cd "$srcdir"
+
PKG_NAME=`autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac"`
if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
@@ -22,6 +25,8 @@ aclocal --install || exit 1
autoreconf --verbose --force --install -Wno-portability || exit 1
set +x
+cd "$olddir"
+
if [ "$NOCONFIGURE" = "" ]; then
set -x
$srcdir/configure "$@" || exit 1
diff --git a/src/Makefile.am b/src/Makefile.am
index 446f87d..a79662e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,4 +71,7 @@ EXTRA_DIST += $(ui_files)
gnome-battery-bench.gresource.c: $(ui_files)
%.gresource.c : %.gresource.xml
- $(GLIB_COMPILE_RESOURCES) --generate --target $@ $<
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
+ --sourcedir="$(srcdir)" \
+ --generate \
+ --target $@ $<
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]