[Spice-commits] 4 commits - .mailmap Makefile.am configure.ac tests/Makefile.am

[Marc-André Lureau]

 .mailmap          |    1 +
 Makefile.am       |    2 ++
 configure.ac      |    2 +-
 tests/Makefile.am |    2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 65545d23cd55e3f49a9c2b481a5c3fd77e3015a8
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Wed Oct 29 18:39:35 2014 +0100

    mailmap: add Dietmar Maurer

diff --git a/.mailmap b/.mailmap
index 2eb4488..f7fdf30 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,3 +5,4 @@
 <cfergeau at redhat.com> <cfergeau at gmail.com>
 <marcandre.lureau at redhat.com> <marcandre.lureau at gmail.com>
 Tiziano Müller <tiziano.mueller at stepping-stone.ch> <dev-zero at gentoo.org>
+Dietmar Maurer <dietmar at proxmox.com> <dietmar at proxmox.com>
\ No newline at end of file
commit 905c35208f453aef18d3717022c2c2fba58421fc
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Thu Oct 30 13:49:07 2014 +0100

    build-sys: add some missing MAINTAINERCLEANFILES

diff --git a/Makefile.am b/Makefile.am
index 5029497..8ac2028 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,6 +56,7 @@ MAINTAINERCLEANFILES =				\
 	m4/ltsugar.m4				\
 	m4/ltversion.m4				\
 	m4/lt~obsolete.m4			\
+	build-aux/ar-lib			\
 	build-aux/compile			\
 	build-aux/config.guess			\
 	build-aux/config.rpath			\
@@ -65,6 +66,7 @@ MAINTAINERCLEANFILES =				\
 	build-aux/ltmain.sh			\
 	build-aux/missing			\
 	build-aux/mkinstalldirs			\
+	build-aux/test-driver			\
 	po/Makefile.in.in			\
 	gtk-doc.make				\
 	$(NULL)
commit 02fe4df1545e75a71c3e944a8f5e4624c9a59c3a
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Thu Oct 30 13:45:51 2014 +0100

    build-sys: generate gitignore in tests dir

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6f80d93..b236b12 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,3 +20,5 @@ LDADD =							\
 
 util_SOURCES = util.c
 coroutine_SOURCES = coroutine.c
+
+-include $(top_srcdir)/git.mk
commit 4103582891b90370ca5ba8e9340b8387dfa33514
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Wed Oct 29 18:12:32 2014 +0100

    build-sys: change default libtool options
    
    - disable-static: it's quite uncommon to use static build of gtk libraries
    - win32-dll: the shared libs build cleanly for win32 already

diff --git a/configure.ac b/configure.ac
index f47ee20..0d65823 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 
 AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Werror -Wno-portability])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-LT_INIT
+LT_INIT([disable-static win32-dll])
 AM_MAINTAINER_MODE
 
 IT_PROG_INTLTOOL([0.40.0])