We add a helper python script build-aux/make-authors.py The .mailmap
is expanded to give output as close to the original AUTHORS file as
possible. Drop the syntax-check that validated AUTHORS is up to date.

AUTHORS.in tracks the maintainers, as well as some folks who were
previously in AUTHORS but don't have a git commit with proper
attribution.
---
 .gitignore                |   1 +
 .mailmap                  |  13 +++
 AUTHORS                   | 279 ----------------------------------------------
 AUTHORS.in                |  86 ++++++++++++++
 Makefile.am               |  12 +-
 bootstrap.conf            |   3 +-
 build-aux/make-authors.py |  44 ++++++++
 cfg.mk                    |  15 ---
 8 files changed, 157 insertions(+), 296 deletions(-)
 delete mode 100644 AUTHORS
 create mode 100644 AUTHORS.in
 create mode 100644 build-aux/make-authors.py

If someone wants to suggest a perl or shell script replacement I'm all ears.
Or we could just commit to sorting AUTHORS alphabetically and let sort +
uniq do all the work.

diff --git a/.gitignore b/.gitignore
index 1cd2d45..004bc76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 .memdump
 .sc-start-sc_*
 /ABOUT-NLS
+/AUTHORS
 /COPYING
 /ChangeLog
 /GNUmakefile
diff --git a/.mailmap b/.mailmap
index 76e6513..924c501 100644
--- a/.mailmap
+++ b/.mailmap
@@ -34,6 +34,8 @@
 <g...@egidy.de> <li...@egidy.de>
 <g...@egidy.de> <gerd.von.eg...@intra2net.com>
 <ben...@dolka.fr> <benjamin.c...@telecom-bretagne.eu>
+<serge.hal...@canonical.com> <se...@us.ibm.com>
+<pritesh.koth...@sun.com> <pritesh.koth...@sun.com>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>
@@ -42,3 +44,14 @@ Royce Lv <lvro...@linux.vnet.ibm.com>
 Daniel J Walsh <dwa...@redhat.com>
 Ján Tomko <jto...@redhat.com>
 Gerd von Egidy <g...@egidy.de>
+MATSUDA Daiki <matsuda...@intellilink.co.jp>
+Tang Chen <tangc...@cn.fujitsu.com>
+Peng Zhou <ailvpen...@gmail.com>
+Dirk Herrendoerfer <d.herrendoer...@herrendoerfer.name>
+Thibault VINCENT <thibault.vinc...@smartjog.com>
+Aurelien Rougemont <be...@binaries.fr>
+Serge E. Hallyn <serge.hal...@canonical.com>
+Henrik Persson E <henrik.e.pers...@ericsson.com>
+Philipp Hahn <h...@univention.de>
+Marco Bozzolan <bozzo...@gmail.com>
+Pritesh Kothari <pritesh.koth...@sun.com>
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 27c4eda..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,279 +0,0 @@
-   libvirt Authors
-   ===============
-
-The libvirt project was initiated by:
-
-  Daniel Veillard      <veill...@redhat.com> or <dan...@veillard.com>
-
-The primary maintainers and people with commit access rights:
-
-  Daniel Veillard      <veill...@redhat.com>
-  Daniel Berrange      <berra...@redhat.com>
-  Richard W.M. Jones   <rjo...@redhat.com>
-  Mark McLoughlin      <mar...@redhat.com>
-  Anthony Liguori      <aligu...@us.ibm.com>
-  Jim Meyering         <meyer...@redhat.com>
-  Jim Fehlig           <jfeh...@suse.com>
-  Chris Lalancette     <clala...@redhat.com>
-  Cole Robinson        <crobi...@redhat.com>
-  Guido Günther        <a...@sigxcpu.org>
-  John Levon           <john.le...@sun.com>
-  Matthias Bolte       <matthias.bo...@googlemail.com>
-  Jiří Denemark        <jdene...@redhat.com>
-  Dave Allan           <dal...@redhat.com>
-  Laine Stump          <la...@redhat.com>
-  Stefan Berger        <stef...@us.ibm.com>
-  Eric Blake           <ebl...@redhat.com>
-  Justin Clift         <jcl...@redhat.com>
-  Osier Yang           <jy...@redhat.com>
-  Wen Congyang         <we...@cn.fujitsu.com>
-  Michal Prívozník     <mpriv...@redhat.com>
-  Peter Krempa         <pkre...@redhat.com>
-  Christophe Fergeau   <cferg...@redhat.com>
-  Alex Jia             <a...@redhat.com>
-  Martin Kletzander    <mklet...@redhat.com>
-
-Previous maintainers:
-  Karel Zak            <k...@redhat.com>
-  Atsushi SAKAI        <sak...@jp.fujitsu.com>
-  Dave Leskovec        <dle...@linux.vnet.ibm.com>
-  Dan Smith            <da...@us.ibm.com>
-
-Patches have also been contributed by:
-
-  David Lutterkort     <dlut...@redhat.com>
-  Andrew Puch          <ap...@redhat.com>
-  Philippe Berthault   <philippe.bertha...@bull.net>
-  Hugh Brock           <hbr...@redhat.com>
-  Michel Ponceau       <michel.ponc...@bull.net>
-  Jeremy Katz          <ka...@redhat.com>
-  Pete Vetere          <pvet...@redhat.com>
-  Kazuki Mizushima     <mizushima.ka...@jp.fujitsu.com>
-  Saori Fukuta         <fukuta.sa...@jp.fujitsu.com>
-  Tatsuro Enokura      <fj771...@aa.jp.fujitsu.com>
-  Takahashi Tomohiro   <taka...@jp.fujitsu.com>
-  Nobuhiro Itou        <fj087...@aa.jp.fujitsu.com>
-  Masayuki Sunou       <fj182...@aa.jp.fujitsu.com>
-  Mark Johnson         <johnson...@gmail.com>
-  Christian Ehrhardt   <ehrha...@linux.vnet.ibm.com>
-  Shuveb Hussain       <shu...@binarykarma.com>
-  Jim Paris            <j...@jtan.com>
-  Daniel Hokka Zakrisson <dan...@hozac.com>
-  Mads Chr. Olesen     <shi...@shiyee.dk>
-  Anton Protopopov     <asp...@gmail.com>
-  Stefan de Konink     <dekon...@kinkrsoftware.nl>
-  Kaitlin Rupert       <kait...@linux.vnet.ibm.com>
-  Evgeniy Sokolov      <e...@openvz.org>
-  David Lively         <dliv...@virtualiron.com>
-  Charles Duffy        <charles_du...@messageone.com>
-  Nguyen Anh Quynh     <aqu...@gmail.com>
-  James Morris         <jmor...@namei.org>
-  Chris Wright         <chr...@redhat.com>
-  Ben Guthro           <ben.gut...@gmail.com>
-  Shigeki Sakamoto     <fj058...@aa.jp.fujitsu.com>
-  Gerd von Egidy       <g...@egidy.de>
-  Itamar Heim          <ih...@redhat.com>
-  Markus Armbruster    <arm...@redhat.com>
-  Ryota Ozaki          <ozaki.ry...@gmail.com>
-  Daniel J Walsh       <dwa...@redhat.com>
-  Maximilian Wilhelm   <m...@rfc2324.org>
-  Pritesh Kothari      <pritesh.koth...@sun.com>
-  Amit Shah            <amit.s...@redhat.com>
-  Florian Vichot       <florian.vic...@diateam.net>
-  Serge E. Hallyn      <se...@us.ibm.com>
-  Soren Hansen         <so...@linux2go.dk>
-  Abel Míguez Rodríguez<amigu...@pdi.ucm.es>
-  Doug Goldstein       <car...@cardoe.com>
-  Javier Fontan        <jfon...@gmail.com>
-  Federico Simoncelli  <fsimo...@redhat.com>
-  Amy Griffis          <amy.grif...@hp.com>
-  Henrik Persson E     <henrik.e.pers...@ericsson.com>
-  Satoru SATOH         <satoru.sa...@gmail.com>
-  Paolo Bonzini        <pbonz...@redhat.com>
-  Miloslav Trmač       <m...@redhat.com>
-  Jamie Strandboge     <ja...@canonical.com>
-  Gerhard Stenzel      <gerhard.sten...@de.ibm.com>
-  Matthew Booth        <mbo...@redhat.com>
-  Diego Elio Pettenò   <flamee...@gmail.com>
-  Adam Litke           <a...@us.ibm.com>
-  Steve Yarmie         <steve.yar...@gmail.com>
-  Dan Kenigsberg       <dan...@redhat.com>
-  Yuji NISHIDA         <nish...@nict.go.jp>
-  Dustin Xiong         <x_k_...@hotmail.com>
-  Rolf Eike Beer       <e...@sf-mail.de>
-  Wolfgang Mauerer     <wolfgang.maue...@siemens.com>
-  Philipp Hahn         <h...@univention.de>
-  Ed Swierk            <eswi...@aristanetworks.com>
-  Paolo Smiraglia      <paolo.smirag...@gmail.com>
-  Sharadha Prabhakar   <sharadha.prabha...@citrix.com>
-  Chris Wong           <wongc-red...@hoku.net>
-  Daniel Berteaud      <dan...@firewall-services.com>
-  Dustin Kirkland      <kirkl...@canonical.com>
-  Luiz Capitulino      <lcapitul...@redhat.com>
-  Ryan Harper          <ry...@us.ibm.com>
-  Spencer Shimko       <sshi...@tresys.com>
-  Marco Bozzolan       <bozzo...@gmail.com>
-  Alex Williamson      <alex.william...@redhat.com>
-  Ersek Laszlo         <la...@caesar.elte.hu>
-  Kenneth Nagin        <na...@il.ibm.com>
-  Klaus Ethgen         <kl...@ethgen.de>
-  Bryan Kearney        <bkear...@redhat.com>
-  Darry L. Pierce      <dpie...@redhat.com>
-  David Jorm           <d...@redhat.com>
-  Eduardo Otubo        <ot...@linux.vnet.ibm.com>
-  Garry Dolley         <gdol...@arpnetworks.com>
-  Harshavardhana       <har...@gluster.com>
-  Jonas Eriksson       <jonas.j.eriks...@ericsson.com>
-  Jun Koi              <junkoi2...@gmail.com>
-  Olivier Fourdan      <ofour...@redhat.com>
-  Ron Yorston          <r...@tigress.co.uk>
-  Shahar Klein         <shaharkl...@yahoo.com>
-  Taizo ITO            <taizo....@hde.co.jp>
-  Thomas Treutner      <tho...@scripty.at>
-  Jean-Baptiste Rouault <jean-baptiste.roua...@diateam.net>
-  Марк Коренберг       <socketp...@gmail.com>
-  Alan Pevec           <ape...@redhat.com>
-  Aurelien Rougemont   <be...@binaries.fr>
-  Patrick Dignan       <pat_dig...@dell.com>
-  Serge Hallyn         <serge.hal...@canonical.com>
-  Nikunj A. Dadhania   <nik...@linux.vnet.ibm.com>
-  Lai Jiangshan        <la...@cn.fujitsu.com>
-  Harsh Prateek Bora   <ha...@linux.vnet.ibm.com>
-  John Morrissey       <j...@horde.net>
-  KAMEZAWA Hiroyuki    <kamezawa.hir...@jp.fujitsu.com>
-  Hu Tao               <hu...@cn.fujitsu.com>
-  Laurent Léonard      <laur...@open-minds.org>
-  MORITA Kazutaka      <morita.kazut...@lab.ntt.co.jp>
-  Josh Durgin          <josh.dur...@inktank.com>
-  Roopa Prabhu         <ropra...@cisco.com>
-  Paweł Krześniak      <pawel.krzesn...@gmail.com>
-  Kay Schubert         <kayeg...@web.de>
-  Marc-André Lureau    <marcandre.lur...@redhat.com>
-  Juerg Haefliger      <juerg.haefli...@hp.com>
-  Matthias Dahl        <mdv...@designassembly.de>
-  Niels de Vos         <nde...@redhat.com>
-  Davidlohr Bueso      <d...@gnu.org>
-  Alon Levy            <al...@redhat.com>
-  Hero Phương          <herophuon...@gmail.com>
-  Zdenek Styblik       <sty...@turnovfree.net>
-  Gui Jianfeng         <guijianf...@cn.fujitsu.com>
-  Michal Novotny       <minov...@redhat.com>
-  Markus Groß          <gr...@univention.de>
-  Phil Petty           <phpe...@cisco.com>
-  Taku Izumi           <izumi.t...@jp.fujitsu.com>
-  Minoru Usui          <u...@mxm.nes.nec.co.jp>
-  Tiziano Mueller      <dev-z...@gentoo.org>
-  Thibault VINCENT     <thibault.vinc...@smartjog.com>
-  Naoya Horiguchi      <n-horigu...@ah.jp.nec.com>
-  Jesse Cook           <code.crash...@gmail.com>
-  Alexander Todorov    <atodo...@otb.bg>
-  Richard Laager       <rlaa...@wiktel.com>
-  Mark Wu              <d...@redhat.com>
-  Yufang Zhang         <yuzh...@redhat.com>
-  Supriya Kannery      <supri...@linux.vnet.ibm.com>
-  Dirk Herrendoerfer   <d.herrendoer...@herrendoerfer.name>
-  Taisuke Yamada       <t...@rakugaki.org>
-  Heath Petersen       <heathpeter...@kandre.com>
-  Neil Wilson          <n...@aldur.co.uk>
-  Ohad Levy            <ohadl...@gmail.com>
-  Michael Chapman      <m...@very.puzzling.org>
-  Daniel Gollub        <gol...@b1-systems.de>
-  David S. Wang        <dwa...@cisco.com>
-  Ruben Kerkhof        <ru...@rubenkerkhof.com>
-  Scott Moser          <smo...@ubuntu.com>
-  Guannan Ren          <g...@redhat.com>
-  John Williams        <john.willi...@petalogix.com>
-  Michael Santos       <michael.san...@gmail.com>
-  Oskari Saarenmaa     <o...@ohmu.fi>
-  Nan Zhang            <nzh...@redhat.com>
-  Wieland Hoffmann     <themi...@googlemail.com>
-  Douglas Schilling Landgraf <dougsl...@redhat.com>
-  Tom Vijlbrief        <tom.vijlbr...@xs4all.nl>
-  Shradha Shah         <ss...@solarflare.com>
-  Steve Hodgson        <shodg...@solarflare.com>
-  Xu He Jie            <x...@linux.vnet.ibm.com>
-  Lei Li               <li...@linux.vnet.ibm.com>
-  Matthias Witte       <wi...@netzquadrat.de>
-  Tang Chen            <tangc...@cn.fujitsu.com>
-  Dan Horák            <d...@danny.cz>
-  Sage Weil            <s...@newdream.net>
-  David L Stevens      <dlstev...@us.ibm.com>
-  Tyler Coumbes        <coum...@gmail.com>
-  Royce Lv             <lvro...@linux.vnet.ibm.com>
-  Patrice LACHANCE     <patlacha...@gmail.com>
-  Eli Qiao             <ta...@linux.vnet.ibm.com>
-  Michael Wood         <esiot...@gmail.com>
-  Bharata B Rao        <bhar...@linux.vnet.ibm.com>
-  Srivatsa S. Bhat     <srivatsa.b...@linux.vnet.ibm.com>
-  Chang Liu            <lingjiao...@taobao.com>
-  Lorin Hochstein      <lo...@isi.edu>
-  Christian Franke     <nob...@nowhere.ws>
-  Prerna Saxena        <pre...@linux.vnet.ibm.com>
-  Michael Ellerman     <mich...@ellerman.id.au>
-  Rommer               <rom...@active.by>
-  Yuri Chornoivan      <yurc...@ukr.net>
-  Deepak C Shetty      <deepa...@linux.vnet.ibm.com>
-  Laszlo Ersek         <ler...@redhat.com>
-  Zeeshan Ali (Khattak) <zeesha...@gnome.org>
-  Marcelo Cerri        <mhce...@linux.vnet.ibm.com>
-  Hendrik Schwartke    <hend...@os-t.de>
-  Ansis Atteka         <aatt...@nicira.com>
-  Dan Wendlandt        <d...@nicira.com>
-  Kyle Mestery         <kmest...@cisco.com>
-  Lincoln Myers        <lincoln_my...@yahoo.com>
-  Peter Robinson       <pbrobin...@gmail.com>
-  Benjamin Cama        <ben...@dolka.fr>
-  Duncan Rance         <libv...@dunquino.com>
-  Peng Zhou            <ailvpen...@gmail.com>
-  Li Zhang             <zhlci...@linux.vnet.ibm.com>
-  Stef Walter          <st...@gnome.org>
-  Christian Benvenuti  <be...@cisco.com>
-  Ilja Livenson        <ilja.liven...@gmail.com>
-  Stefan Bader         <stefan.ba...@canonical.com>
-  MATSUDA Daiki        <matsuda...@intellilink.co.jp>
-  Jan Kiszka           <jan.kis...@siemens.com>
-  Ryan Woodsmall       <rwoodsm...@gmail.com>
-  Wido den Hollander   <w...@widodh.nl>
-  Eugen Feller         <eugen.fel...@inria.fr>
-  Dmitry Guryanov      <dgurya...@parallels.com>
-  William Jon McCann   <william.jon.mcc...@gmail.com>
-  David Weber          <w...@munzinger.de>
-  Marti Raudsepp       <ma...@juffo.org>
-  Radu Caragea         <dmns_s...@yahoo.com>
-  Beat Jörg            <beat.jo...@ssatr.ch>
-  Gao feng             <gaof...@cn.fujitsu.com>
-  Dipankar Sarma       <dipan...@in.ibm.com>
-  Gerd Hoffmann        <kra...@redhat.com>
-  Viktor Mihajlovski   <mihaj...@linux.vnet.ibm.com>
-  Thang Pham           <thang.p...@us.ibm.com>
-  Eiichi Tsukata       <eiichi.tsukata...@hitachi.com>
-  Sascha Peilicke      <sasc...@suse.de>
-  Chuck Short          <chuck.sh...@canonical.com>
-  Sebastian Wiedenroth <wi...@frubar.net>
-  Ata E Husain Bohra   <ata.hus...@hotmail.com>
-  Ján Tomko            <jto...@redhat.com>
-  Richa Marwaha        <rmar...@linux.vnet.ibm.com>
-  Peter Feiner         <pe...@gridcentric.ca>
-  Frido Roose          <frido.ro...@gmail.com>
-  Asad Saeed           <asad.sa...@acidseed.com>
-  Sukadev Bhattiprolu  <suka...@linux.vnet.ibm.com>
-  Thomas Woerner       <twoer...@redhat.com>
-  J.B. Joret           <j...@linux.vnet.ibm.com>
-  Stefan Hajnoczi      <stefa...@linux.vnet.ibm.com>
-  Gene Czarcinski      <g...@czarc.net>
-  Nishank Trivedi      <nistr...@cisco.com>
-  Jasper Lievisse Adriaanse <jas...@humppa.nl>
-  Paul Eggert          <egg...@cs.ucla.edu>
-  Dwight Engen         <dwight.en...@oracle.com>
-  liguang              <lig.f...@cn.fujitsu.com>
-  Chuck Short          <zul...@gmail.com>
-  Alexander Larsson    <al...@redhat.com>
-
-  [....send patches to get your name here....]
-
-The libvirt Logo was designed by Diana Fong
-
--- End
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/AUTHORS.in b/AUTHORS.in
new file mode 100644
index 0000000..849badf
--- /dev/null
+++ b/AUTHORS.in
@@ -0,0 +1,86 @@
+   libvirt Authors
+   ===============
+
+The libvirt project was initiated by:
+
+  Daniel Veillard      <veill...@redhat.com> or <dan...@veillard.com>
+
+The primary maintainers and people with commit access rights:
+
+  Daniel Veillard      <veill...@redhat.com>
+  Daniel Berrange      <berra...@redhat.com>
+  Richard W.M. Jones   <rjo...@redhat.com>
+  Mark McLoughlin      <mar...@redhat.com>
+  Anthony Liguori      <aligu...@us.ibm.com>
+  Jim Meyering         <meyer...@redhat.com>
+  Jim Fehlig           <jfeh...@suse.com>
+  Chris Lalancette     <clala...@redhat.com>
+  Cole Robinson        <crobi...@redhat.com>
+  Guido Günther        <a...@sigxcpu.org>
+  John Levon           <john.le...@sun.com>
+  Matthias Bolte       <matthias.bo...@googlemail.com>
+  Jiří Denemark        <jdene...@redhat.com>
+  Dave Allan           <dal...@redhat.com>
+  Laine Stump          <la...@redhat.com>
+  Stefan Berger        <stef...@us.ibm.com>
+  Eric Blake           <ebl...@redhat.com>
+  Justin Clift         <jcl...@redhat.com>
+  Osier Yang           <jy...@redhat.com>
+  Wen Congyang         <we...@cn.fujitsu.com>
+  Michal Prívozník     <mpriv...@redhat.com>
+  Peter Krempa         <pkre...@redhat.com>
+  Christophe Fergeau   <cferg...@redhat.com>
+  Alex Jia             <a...@redhat.com>
+  Martin Kletzander    <mklet...@redhat.com>
+
+Previous maintainers:
+  Karel Zak            <k...@redhat.com>
+  Atsushi SAKAI        <sak...@jp.fujitsu.com>
+  Dave Leskovec        <dle...@linux.vnet.ibm.com>
+  Dan Smith            <da...@us.ibm.com>
+
+Patches have also been contributed by:
+
+  David Lutterkort     <dlut...@redhat.com>
+  Andrew Puch          <ap...@redhat.com>
+  Philippe Berthault   <philippe.bertha...@bull.net>
+  Hugh Brock           <hbr...@redhat.com>
+  Michel Ponceau       <michel.ponc...@bull.net>
+  Jeremy Katz          <ka...@redhat.com>
+  Pete Vetere          <pvet...@redhat.com>
+  Kazuki Mizushima     <mizushima.ka...@jp.fujitsu.com>
+  Saori Fukuta         <fukuta.sa...@jp.fujitsu.com>
+  Tatsuro Enokura      <fj771...@aa.jp.fujitsu.com>
+  Takahashi Tomohiro   <taka...@jp.fujitsu.com>
+  Nobuhiro Itou        <fj087...@aa.jp.fujitsu.com>
+  Masayuki Sunou       <fj182...@aa.jp.fujitsu.com>
+  Mark Johnson         <johnson...@gmail.com>
+  Christian Ehrhardt   <ehrha...@linux.vnet.ibm.com>
+  Shuveb Hussain       <shu...@binarykarma.com>
+  Daniel Hokka Zakrisson <dan...@hozac.com>
+  Mads Chr. Olesen     <shi...@shiyee.dk>
+  Anton Protopopov     <asp...@gmail.com>
+  Stefan de Konink     <dekon...@kinkrsoftware.nl>
+  Kaitlin Rupert       <kait...@linux.vnet.ibm.com>
+  Evgeniy Sokolov      <e...@openvz.org>
+  David Lively         <dliv...@virtualiron.com>
+  James Morris         <jmor...@namei.org>
+  Ben Guthro           <ben.gut...@gmail.com>
+  Shigeki Sakamoto     <fj058...@aa.jp.fujitsu.com>
+  Amit Shah            <amit.s...@redhat.com>
+  Itamar Heim          <ih...@redhat.com>
+  Markus Armbruster    <arm...@redhat.com>
+  Abel Míguez Rodríguez<amigu...@pdi.ucm.es>
+  Javier Fontan        <jfon...@gmail.com>
+  Matthias Witte       <wi...@netzquadrat.de>
+  Dan Wendlandt        <d...@nicira.com>
+@authorlist@
+
+  [....send patches to get your name here....]
+
+The libvirt Logo was designed by Diana Fong
+
+-- End
+;; Local Variables:
+;; coding: utf-8
+;; End:
diff --git a/Makefile.am b/Makefile.am
index 333e300..73d6a00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,7 @@ EXTRA_DIST = \
   cfg.mk \
   examples/domain-events/events-python \
   run.in \
+  AUTHORS.in \
   $(XML_EXAMPLES)
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -78,7 +79,7 @@ MAINTAINERCLEANFILES = .git-module-status
 # disable this check
 distuninstallcheck:
 
-dist-hook: gen-ChangeLog
+dist-hook: gen-ChangeLog gen-AUTHORS
 
 # Generate the ChangeLog file (with all entries since the switch to git)
 # and insert it into the directory we're about to use to create a tarball.
@@ -91,3 +92,12 @@ gen-ChangeLog:
          rm -f $(distdir)/ChangeLog;                           \
          mv $(distdir)/cl-t $(distdir)/ChangeLog;              \
        fi
+
+.PHONY: gen-AUTHORS
+gen-AUTHORS:
+       if test -d .git; then \
+        git log --pretty=format:"%aN@@@%aE" | \
+           python $(top_srcdir)/build-aux/make-authors.py > \
+        $(distdir)/AUTHORS-tmp && \
+         mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
+       fi
diff --git a/bootstrap.conf b/bootstrap.conf
index f8b7c4d..c40db3d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -223,7 +223,8 @@ if `(${PYTHON_CONFIG-python-config} --version;
   PYTHON_CONFIG=true
 fi
 
-# Automake requires that ChangeLog exist.
+# Automake requires that ChangeLog and AUTHORS exist.
+touch AUTHORS || exit 1
 touch ChangeLog || exit 1
 
 # Override bootstrap's list - we don't use mdate-sh or texinfo.tex.
diff --git a/build-aux/make-authors.py b/build-aux/make-authors.py
new file mode 100644
index 0000000..f1df62f
--- /dev/null
+++ b/build-aux/make-authors.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+#
+# make-authors.py: Generate AUTHORS file from AUTHORS.in and git
+#   log output on stdin
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
+import sys
+
+lines = sys.stdin.read().splitlines()
+lines.reverse()
+template = file("AUTHORS.in").read()
+
+authlist = ""
+authlist = []
+for line in lines:
+    name, email = line.split("@@@")
+    if email in template:
+        continue
+
+    entry = "  %-20s <%s>" % (name.decode("utf-8"), email)
+    if entry in authlist:
+        continue
+    authlist.append(entry)
+
+template = template.split("@authorlist@")
+output = "%s%s%s" % (template[0],
+                     "\n".join(authlist).encode("utf-8"),
+                     template[1])
+sys.stdout.write(output)
diff --git a/cfg.mk b/cfg.mk
index e1fbf4f..eed7fd8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -43,7 +43,6 @@ _test_script_regex = \<\(init\|test-lib\)\.sh\>
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip =                 \
   changelog-check                      \
-  check-AUTHORS                                \
   makefile-check                       \
   makefile_path_separator_check                \
   patch-check                          \
@@ -711,20 +710,6 @@ _autogen:
        $(srcdir)/autogen.sh
        ./config.status
 
-# Give credit where due:
-# Ensure that each commit author email address (possibly mapped via
-# git log's .mailmap) appears in our AUTHORS file.
-sc_check_author_list:
-       @fail=0;                                                        \
-       for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \
-         sanitized=$$(echo "$$i"|LC_ALL=C sed 's/\([^a-zA-Z0-9_@-]\)/\\\1/g'); 
\
-         grep -iq "<$$sanitized>" $(srcdir)/AUTHORS                    \
-           || { printf '%s\n' "$$i" >&2; fail=1; };                    \
-       done;                                                           \
-       test $$fail = 1                                                 \
-         && echo '$(ME): committer(s) not listed in AUTHORS' >&2;      \
-       test $$fail = 0
-
 # regenerate HACKING as part of the syntax-check
 syntax-check: $(top_srcdir)/HACKING
 
-- 
1.7.11.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Reply via email to