summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2013-04-10 19:05:16 +0200
committerMarc-André Lureau <marcandre.lureau@redhat.com>2013-04-10 19:33:38 +0200
commit5150285e1cba35570c29bd923df065d2c81f081e (patch)
tree7d8be57735da59a57e587eea471d58cfb60d9c14
parentb2e13ec5ab362ce53281b742f7dd402f61c8d665 (diff)
build-sys: keep common submodule up to date
This requires git 1.8.2 to work properly. With this we should no longer need to update the reference, assuming the tarball is always up to date (that doesn't change from before, you need to update the submodule)
-rw-r--r--.gitmodules1
-rwxr-xr-xautogen.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 0c618ee..57aaded 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
[submodule "spice-common"]
path = spice-common
url = ../spice-common
+ branch = master
diff --git a/autogen.sh b/autogen.sh
index 0c18272..85b76a9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@ set -e # exit on errors
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-git submodule update --init --recursive
+git submodule update --init --recursive --remote
gtkdocize
autoreconf -v --force --install