[clutter-gst/clutter-gst-3.0] build: Allow building in non-srcdir
- From: Lionel Landwerlin <llandwerlin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter-gst/clutter-gst-3.0] build: Allow building in non-srcdir
- Date: Fri, 17 Jun 2016 18:46:43 +0000 (UTC)
commit 7de343d540a94f4164d5f69809547a4e3e8a6c8d
Author: Ting-Wei Lan <lantw src gnome org>
Date: Tue Jun 14 10:17:56 2016 +0800
build: Allow building in non-srcdir
https://bugzilla.gnome.org/show_bug.cgi?id=767626
autogen.sh | 8 +++++---
clutter-gst/Makefile.am | 7 ++++---
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index d83f1c4..e6d0664 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,8 @@
#! /bin/sh
-gtkdocize || exit 1
-autoreconf -v --install || exit 1
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+( cd "$srcdir" && gtkdocize ) || exit 1
+( cd "$srcdir" && autoreconf -v --install ) || exit 1
if test -z "$NOCONFIGURE"; then
- ./configure "$@" || exit 1
+ "$srcdir/configure" "$@" || exit 1
fi
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
index cac901f..0df17b3 100644
--- a/clutter-gst/Makefile.am
+++ b/clutter-gst/Makefile.am
@@ -24,7 +24,7 @@ source_h = \
$(srcdir)/clutter-gst.h \
$(srcdir)/clutter-gst-types.h \
$(srcdir)/clutter-gst-util.h \
- $(srcdir)/clutter-gst-version.h \
+ $(builddir)/clutter-gst-version.h \
$(srcdir)/clutter-gst-camera.h \
$(srcdir)/clutter-gst-camera-manager.h \
$(srcdir)/clutter-gst-camera-device.h \
@@ -38,14 +38,14 @@ source_h = \
source_priv_h = \
$(srcdir)/clutter-gst-debug.h \
- $(srcdir)/clutter-gst-marshal.h \
+ $(builddir)/clutter-gst-marshal.h \
$(srcdir)/clutter-gst-private.h \
$(NULL)
source_c = \
$(srcdir)/clutter-gst-debug.c \
$(srcdir)/clutter-gst-types.c \
- $(srcdir)/clutter-gst-marshal.c \
+ $(builddir)/clutter-gst-marshal.c \
$(srcdir)/clutter-gst-player.c \
$(srcdir)/clutter-gst-camera.c \
$(srcdir)/clutter-gst-camera-manager.c \
@@ -69,6 +69,7 @@ libclutter_gst_ CLUTTER_GST_MAJORMINOR@_la_SOURCES = \
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_builddir) \
$(NULL)
AM_CPPFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]