[balsa/gtk3] Build with builddir != srcdir
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Build with builddir != srcdir
- Date: Wed, 1 Jun 2016 01:06:48 +0000 (UTC)
commit 25156fc65685db2ea47122eaa23dad42b95255d3
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue May 31 21:05:29 2016 -0400
Build with builddir != srcdir
* autogen.sh: chdir to $srcdir to create configure, then back to
$builddir to use it.
* libbalsa/imap/Makefile.am: provide path to
libimap-marshal.list.
2016-05-31 Albrecht Dreß
ChangeLog | 9 +++++++++
autogen.sh | 12 +++++++++++-
libbalsa/imap/Makefile.am | 5 +++--
3 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5968863..4571388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-05-31 Peter Bloomfield <pbloomfield bellsouth net>
+
+ Build with builddir != srcdir
+
+ * autogen.sh: chdir to srcdir to create configure, then back to
+ builddir to use it.
+ * libbalsa/imap/Makefile.am: provide path to
+ libimap-marshal.list.
+
2016-05-31 Albrecht Dreß
Reduce the code complexity (in particular conditional parts)
diff --git a/autogen.sh b/autogen.sh
index c82d914..26a24dc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,12 @@
#! /bin/sh
# bootstrap file to be used when autogen.sh fails.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+
+cd $srcdir
+
echo "Running gettextize... Ignore non-fatal messages."
glib-gettextize --force --copy || exit 1
echo "running intltoolize..."
@@ -15,5 +22,8 @@ echo "Running autoheader..."
autoheader || exit 1
echo "Running automake..."
automake --gnu --add-missing --copy || exit 1
+
+cd $olddir
+
echo "Running configure $* ..."
-exec ./configure "$@"
+exec $srcdir/configure "$@"
diff --git a/libbalsa/imap/Makefile.am b/libbalsa/imap/Makefile.am
index 7e94e95..23a3265 100644
--- a/libbalsa/imap/Makefile.am
+++ b/libbalsa/imap/Makefile.am
@@ -50,13 +50,14 @@ AM_CFLAGS = $(LIBIMAP_CFLAGS) -ansi
#Signal marshallers
marshal_prefix = libimap
+marshal_srcdir = ${top_srcdir}/libbalsa/imap
libimap-marshal.h: libimap-marshal.list
- ( @GLIB_GENMARSHAL@ --prefix=$(marshal_prefix) libimap-marshal.list --header > libimap-marshal.tmp \
+ ( @GLIB_GENMARSHAL@ --prefix=$(marshal_prefix) ${marshal_srcdir}/libimap-marshal.list --header >
libimap-marshal.tmp \
&& mv libimap-marshal.tmp libimap-marshal.h ) \
|| ( rm -f libimap-marshal.tmp && exit 1 )
libimap-marshal.c: libimap-marshal.h
( echo "#include \"libimap-marshal.h\"" > libimap-marshal.tmp \
- && @GLIB_GENMARSHAL@ --prefix=$(marshal_prefix) libimap-marshal.list --body >> libimap-marshal.tmp \
+ && @GLIB_GENMARSHAL@ --prefix=$(marshal_prefix) ${marshal_srcdir}/libimap-marshal.list --body >>
libimap-marshal.tmp \
&& mv libimap-marshal.tmp libimap-marshal.c ) \
|| ( rm -f libimap-marshal.tmp && exit 1 )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]