[Spice-commits] .mailmap Makefile.am THANKS

[Marc-André Lureau]

 .mailmap    |    2 +-
 Makefile.am |   29 +++++++++++------------------
 THANKS      |    9 ---------
 3 files changed, 12 insertions(+), 28 deletions(-)

New commits:
commit a26c2e3df77c744a4452493ef28885c7b12f2541
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Jan 21 23:37:52 2013 +0100

    build-sys: generate THANKS at dist time

diff --git a/.mailmap b/.mailmap
index 7938323..2eb4488 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,4 +4,4 @@
 <cfergeau at redhat.com> <teuf at gnome.org>
 <cfergeau at redhat.com> <cfergeau at gmail.com>
 <marcandre.lureau at redhat.com> <marcandre.lureau at gmail.com>
-<dev-zero at gentoo.org> <tiziano.mueller at stepping-stone.ch>
+Tiziano Müller <tiziano.mueller at stepping-stone.ch> <dev-zero at gentoo.org>
diff --git a/Makefile.am b/Makefile.am
index a8d585b..ffa1649 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,6 @@ EXTRA_DIST =					\
 	build-aux/git-version-gen		\
 	gtk-doc.make				\
 	.version				\
-	THANKS					\
 	$(INTLTOOL_FILES)			\
 	$(NULL)
 
@@ -66,9 +65,9 @@ MAINTAINERCLEANFILES =				\
 	gtk-doc.make				\
 	$(NULL)
 
-# Generate the ChangeLog file (with all entries since the switch to git)
+# Generate the ChangeLog file
 # and insert it into the directory we're about to use to create a tarball.
-.PHONY: gen-ChangeLog
+.PHONY: gen-ChangeLog gen-THANKS
 gen-ChangeLog:
 	if test -d .git || test -d ../.git; then				\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog > $(distdir)/cl-t;	\
@@ -77,7 +76,7 @@ gen-ChangeLog:
 	fi
 
 # see git-version-gen
-dist-hook: gen-ChangeLog
+dist-hook: gen-ChangeLog gen-THANKS
 	echo $(VERSION) > $(distdir)/.tarball-version
 
 BUILT_SOURCES = $(top_srcdir)/.version
@@ -93,19 +92,13 @@ DISTCHECK_CONFIGURE_FLAGS =			\
 	--with-gtk=3.0				\
 	$(NULL)
 
-spicy-for-windows.exe:
-	PATH=$$PATH:/usr/i686-pc-mingw32/sys-root/mingw/bin/:/usr/i686-pc-mingw32/sys-root/mingw/lib \
-	 nsiswrapper --run --name "spicy" --outfile "spicy-for-windows.exe" --with-gtk \
-	 /usr/i686-pc-mingw32/sys-root/mingw/bin/spicy.exe /usr/i686-pc-mingw32/sys-root/mingw/bin/snappy.exe \
-	 /usr/i686-pc-mingw32/sys-root/mingw/bin/libpangoft2-1.0-0.dll \
-	 /usr/i686-pc-mingw32/sys-root/mingw/bin/libgdk_pixbuf-2.0-0.dll \
-	 /usr/i686-pc-mingw32/sys-root/mingw/bin/libgdk-win32-2.0-0.dll \
-	 /usr/i686-pc-mingw32/sys-root/mingw/bin/gst-*.exe \
-	 /usr/i686-pc-mingw32/sys-root/mingw/lib/gstreamer-0.10/libgstaudio*.dll \
-	 /usr/i686-pc-mingw32/sys-root/mingw/lib/gstreamer-0.10/libgstdirectsoundsink.dll \
-	 /usr/i686-pc-mingw32/sys-root/mingw/lib/gstreamer-0.10/libgstdirectsoundsrc.dll \
-	 /usr/i686-pc-mingw32/sys-root/mingw/lib/gstreamer-0.10/libgstapp.dll \
-	 /usr/i686-pc-mingw32/sys-root/mingw/lib/gstreamer-0.10/libgstautodetect.dll \
-	 /usr/i686-pc-mingw32/sys-root/mingw/lib/gstreamer-0.10/libgstcoreelements.dll
+gen-THANKS:
+	$(AM_V_GEN)if test -d .git || test -d ../.git; then						\
+	  echo "The spice-gtk team would like to thank the following contributors:" > $(distdir)/t-t;	\
+	  echo >> $(distdir)/t-t;									\
+	  git log --format='%aN <%aE>' | sort -u >> $(distdir)/t-t;					\
+	  rm -f $(distdir)/THANKS;									\
+	  mv $(distdir)/t-t $(distdir)/THANKS;								\
+	fi
 
 -include $(top_srcdir)/git.mk
diff --git a/THANKS b/THANKS
deleted file mode 100644
index b296695..0000000
--- a/THANKS
+++ /dev/null
@@ -1,9 +0,0 @@
-The spice-gtk team would like to thanks the following contributors:
-
-Alon Levy <alevy at redhat.com>
-Attila Sukosd <attila.sukosd at gmail.com>
-Christophe Fergeau <cfergeau at redhat.com>
-Daniel P. Berrange <berrange at redhat.com>
-Hans de Goede <hdegoede at redhat.com>
-Nicolas Prochazka <prochazka.nicolas at gmail.com>
-Tiziano Mueller <dev-zero at gentoo.org>