Switch to git

15 files changed, 215 insertions, 223 deletions

diff --git a/.cvsignore b/.gitignore
index e603953..196d4d9 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -1,12 +1,22 @@
+*.a
+*.la
+*.lo
+*.o
+*.so
 *.tar.bz2
 *.tar.gz
+*~
 .bootstrap
+.deps
+.emacs.desktop
 ABOUT-NLS
 INSTALL
+ChangeLog
 Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
+build-aux
 config
 config.h
 config.h.in
diff --git a/ChangeLog b/ChangeLog.2007
index 397e8e6..397e8e6 100644
--- a/ChangeLog
+++ b/ChangeLog.2007
diff --git a/Makefile.am b/Makefile.am
index 2c2a512..b491182 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of GNU cflow
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
 #
 # Written by Sergey Poznyakoff
 #
@@ -23,4 +23,38 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = lib src elisp po doc tests
 
+EXTRA_DIST = ChangeLog.2007
+
+gen_start_date = 2007-06-29
+.PHONY: make-ChangeLog
+make-ChangeLog: 
+	if test -d .git; then                                           \
+	  $(top_srcdir)/build-aux/gitlog-to-changelog                   \
+	    --since=$(gen_start_date) |                                 \
+            sed '/<unknown>$$/d' | fmt -s > $(distdir)/cl-t;            \
+	  echo "" >> $(distdir)/cl-t;                                 \
+	  echo "Local Variables:" >> $(distdir)/cl-t;                   \
+	  echo "mode: change-log" >> $(distdir)/cl-t;                   \
+	  echo "version-control: never"  >> $(distdir)/cl-t;            \
+	  echo "buffer-read-only: t" >> $(distdir)/cl-t;                \
+	  echo "End:" >> $(distdir)/cl-t;                               \
+	  rm -f $(distdir)/ChangeLog;                                   \
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
+	fi
+
+dist-hook: make-ChangeLog
+
+.PHONY: ChangeLog
+ChangeLog: 
+	if test -d .git; then                                           \
+	  $(top_srcdir)/build-aux/gitlog-to-changelog                   \
+	    --since=$(gen_start_date) |                                 \
+            sed '/<unknown>$$/d' | fmt -s > ChangeLog;                  \
+	  echo "" >> ChangeLog;                                       \
+	  echo "Local Variables:" >> ChangeLog;                         \
+	  echo "mode: change-log" >> ChangeLog;                         \
+	  echo "version-control: never"  >> ChangeLog;                  \
+	  echo "buffer-read-only: t" >> ChangeLog;                      \
+	  echo "End:" >> ChangeLog;                                     \
+        fi
 
diff --git a/build-aux/bootstrap b/bootstrap
index b9c11f1..bc9373c 100755
--- a/build-aux/bootstrap
+++ b/bootstrap
@@ -4,10 +4,10 @@
 
 # Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Written by Paul Eggert.
 
@@ -25,10 +23,11 @@ nl='
 '
 
 # Ensure file names are sorted consistently across platforms.
-# Also, ensure diagnostics are in English, e.g., "wget --help" below.
 LC_ALL=C
 export LC_ALL
 
+local_gl_dir=gl
+
 # Temporary directory names.
 bt='._bootmp'
 bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
@@ -49,10 +48,8 @@ Options:
  --force                  Attempt to bootstrap even if the sources seem
                           not to have been checked out.
  --skip-po                Do not download po files.
- --cvs-user=USERNAME      Set the username to use when checking out
-                          sources from the gnulib repository.
 
-If the file .bootstrap.conf exists in the current working directory, its
+If the file bootstrap.conf exists in the current working directory, its
 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.
@@ -61,23 +58,29 @@ Running without arguments will suffice in most cases.
 
 # Configuration.
 
+# Name of the Makefile.am
+gnulib_mk=gnulib.mk
+
 # List of gnulib modules needed.
 gnulib_modules=
 
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
-# Translation Project URL, for the registry of all projects
-# and for the translation-team master directory.
-tp_url() {
-	echo "http://translationproject.org/domain/$1.html"
-}
+# The command to download all .po files for a specified domain into
+# a specified directory.  Fill in the first %s is the domain name, and
+# the second with the destination directory.  Use rsync's -L and -r
+# options because the latest/%s directory and the .po files within are
+# all symlinks.
+po_download_command_format=\
+"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
 
 extract_package_name='
   /^AC_INIT(/{
-     /.*,.*,.*,/{
+     /.*,.*,.*, */{
        s///
        s/[][]//g
+       s/)$//
        p
        q
      }
@@ -104,6 +107,7 @@ gnulib_extra_files="
 	$build_aux/config.sub
 	doc/INSTALL
 "
+
 # Additional gnulib-tool options to use.  Use "\newline" to break lines.
 gnulib_tool_option_extras=
 
@@ -127,9 +131,21 @@ checkout_only_file=README-hacking
 # Whether to use copies instead of symlinks.
 copy=false
 
+# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
+# those files to be generated in directories like lib/, m4/, and po/.
+# Or set it to 'auto' to make this script select which to use based
+# on which version control system (if any) is used in the source directory.
+vc_ignore=auto
+
 # Override the default configuration, if necessary.
 test -r bootstrap.conf && . ./bootstrap.conf
 
+if test "$vc_ignore" = auto; then
+  vc_ignore=
+  test -d .git && vc_ignore=.gitignore
+  test -d CVS && vc_ignore="$vc_ignore .cvsignore"
+fi
+
 # Translate configuration into internal form.
 
 # Parse options.
@@ -142,8 +158,6 @@ do
     exit;;
   --gnulib-srcdir=*)
     GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
-  --cvs-user=*)
-    CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
   --skip-po)
     SKIP_PO=t;;
   --force)
@@ -166,6 +180,7 @@ fi
 insert_sorted_if_absent() {
   file=$1
   str=$2
+  test -f $file || touch $file
   echo "$str" | sort -u - $file | cmp -s - $file \
     || echo "$str" | sort -u - $file -o $file \
     || exit 1
@@ -179,15 +194,17 @@ grep '^[	 ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
     >/dev/null && found_aux_dir=yes
 if test $found_aux_dir = no; then
   echo "$0: expected line not found in configure.ac. Add the following:" >&2
-  echo "  AC_CONFIG_AUX_DIR([$build_aux])" >&2.
+  echo "  AC_CONFIG_AUX_DIR([$build_aux])" >&2
+  exit 1
 fi
 
 # If $build_aux doesn't exist, create it now, otherwise some bits
 # below will malfunction.  If creating it, also mark it as ignored.
 if test ! -d $build_aux; then
   mkdir $build_aux
-  for ig in .cvsignore .gitignore; do
-    test -f $ig && insert_sorted_if_absent $ig $build_aux
+  for dot_ig in x $vc_ignore; do
+    test $dot_ig = x && continue
+    insert_sorted_if_absent $dot_ig $build_aux
   done
 fi
 
@@ -206,23 +223,9 @@ case ${GNULIB_SRCDIR--} in
   if [ ! -d gnulib ]; then
     echo "$0: getting gnulib files..."
 
-    case ${CVS_AUTH-pserver} in
-    pserver)
-      CVS_PREFIX=':pserver:anonymous@';;
-    ssh)
-      CVS_PREFIX="$CVS_USER${CVS_USER+@}";;
-    *)
-      echo "$0: $CVS_AUTH: Unknown CVS access method" >&2
-      exit 1;;
-    esac
-
-    case $CVS_RSH in
-    '') CVS_RSH=ssh; export CVS_RSH;;
-    esac
-
     trap cleanup_gnulib 1 2 13 15
 
-    cvs -z3 -q -d ${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib ||
+    git clone --depth 2 git://git.sv.gnu.org/gnulib ||
       cleanup_gnulib
 
     trap - 1 2 13 15
@@ -235,74 +238,80 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 
 # Get translations.
 
-get_translations() {
+download_po_files() {
   subdir=$1
   domain=$2
-
-  case $WGET_COMMAND in
-  '')
-    echo "$0: wget not available; skipping translations";;
-  ?*)
-    url=`tp_url $domain`
-    baseurl=`expr "$url" : '\(.*\)/.*'`
-    echo "$0: getting translations into $subdir for $domain..." &&
-
-    (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`) &&
-    $WGET_COMMAND -O "$subdir/$domain.html" "$url" &&
-
-    sed -n 's|.*href="\(.*\)/\([^/][^/]*\)/'"$domain"'-\([^/"]*\)\.[^."]*\.po".*|\2:\3:\1|p' <"$subdir/$domain.html" |
-    sort -t: -k 1,1 -k 2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 -k5,5n -k5.5 |
-    awk -F: '
-      { if (lang && $1 != lang) print lang, ver, $3 }
-      { lang = $1; ver = $2 }
-      END { if (lang) print lang, ver, $3 }
-    ' | awk -v domain="$domain" -v baseurl="$baseurl" -v subdir="$subdir" '
-      {
-	lang = $1
-	ver = $2
-	urlfmt = ""
-	printf "{ $WGET_COMMAND -O %s/%s.po %s/%s/%s/%s-%s.%s.po &&\n", subdir, lang, baseurl, $3, lang, domain, ver, lang
-	printf "  msgfmt -c -o /dev/null %s/%s.po || {\n", subdir, lang
-	printf "    echo >&2 '\'"$0"': omitting translation for %s'\''\n", lang
-	printf "    rm -f %s/%s.po; }; } &&\n", subdir, lang
+  echo "$0: getting translations into $subdir for $domain..."
+  cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
+  eval "$cmd"
 }
-      END { print ":" }
-    ' | WGET_COMMAND="$WGET_COMMAND" sh 
-    ;;
-  esac &&
-  ls "$subdir"/*.po 2>/dev/null |
-    sed 's|.*/||; s|\.po$||' >"$subdir/LINGUAS" &&
-  rm -f "$subdir/$domain.html"
+
+# Download .po files to $po_dir/.reference and copy only the new
+# or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
+update_po_files() {
+  # Directory containing primary .po files.
+  # Overwrite them only when we're sure a .po file is new.
+  po_dir=$1
+  domain=$2
+
+  # Download *.po files into this dir.
+  # Usually contains *.s1 checksum files.
+  ref_po_dir="$po_dir/.reference"
+
+  test -d $ref_po_dir || mkdir $ref_po_dir || return
+  download_po_files $ref_po_dir $domain \
+    && ls "$ref_po_dir"/*.po 2>/dev/null |
+      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
+
+  langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
+  test "$langs" = '*' && langs=x
+  for po in `cd $ref_po_dir && echo *.po|sed 's/\.po//g'`; do
+    case $po in x) continue;; esac
+    new_po="$ref_po_dir/$po.po"
+    cksum_file="$ref_po_dir/$po.s1"
+    if ! test -f "$cksum_file" ||
+	! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then
+      echo "updated $po_dir/$po.po..."
+      cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file"
+    fi
+  done
 }
 
 case $SKIP_PO in
 '')
-  case `wget --help` in
-  *'--no-cache'*)
-    WGET_COMMAND='wget -nv --no-cache';;
-  *'--cache=on/off'*)
-    WGET_COMMAND='wget -nv --cache=off';;
-  *'--non-verbose'*)
-    WGET_COMMAND='wget -nv';;
-  *)
-    WGET_COMMAND='';;
-  esac
-
   if test -d po; then
-    get_translations po $package || exit
+    update_po_files po $package || exit
   fi
 
   if test -d runtime-po; then
-    get_translations runtime-po $package-runtime || exit
+    update_po_files runtime-po $package-runtime || exit
   fi;;
 esac
 
-symlink_to_gnulib()
+symlink_to_dir()
 {
-  src=$GNULIB_SRCDIR/$1
-  dst=${2-$1}
+  src=$1/$2
+  dst=${3-$2}
 
   test -f "$src" && {
+
+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=`dirname "$dst"`
+    if ! test -d "$dst_dir"; then
+      mkdir -p "$dst_dir"
+
+      # If we've just created a directory like lib/uniwidth,
+      # tell version control system(s) it's ignorable.
+      # FIXME: for now, this does only one level
+      parent=`dirname "$dst_dir"`
+      for dot_ig in x $vc_ignore; do
+	test $dot_ig = x && continue
+	ig=$parent/$dot_ig
+	insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+      done
+    fi
+
     if $copy; then
       {
 	test ! -h "$dst" || {
@@ -347,7 +356,9 @@ cp_mark_as_generated()
   cp_dst=$2
 
   if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
-    symlink_to_gnulib "$cp_dst"
+    symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
+  elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
+    symlink_to_dir $local_gl_dir "$cp_dst"
   else
     case $cp_dst in
       *.[ch])             c1='/* '; c2=' */';;
@@ -356,6 +367,11 @@ cp_mark_as_generated()
       *)                  c1=     ; c2=     ;;
     esac
 
+    dst_dir=`dirname "$cp_dst"`
+    if ! test -d "$dst_dir"; then
+      mkdir -p "$dst_dir"
+    fi
+    
     if test -z "$c1"; then
       cmp -s "$cp_src" "$cp_dst" || {
 	echo "$0: cp -f $cp_src $cp_dst" &&
@@ -400,18 +416,22 @@ slurp() {
   for dir in . `(cd $1 && find * -type d -print)`; do
     copied=
     sep=
-    for file in `ls $1/$dir`; do
+    for file in `ls -a $1/$dir`; do
+      case $file in
+      .|..) continue;;
+      .*) continue;; # FIXME: should all file names starting with "." be ignored?
+      esac
       test -d $1/$dir/$file && continue
       for excluded_file in $excluded_files; do
 	test "$dir/$file" = "$excluded_file" && continue 2
       done
       if test $file = Makefile.am; then
-        copied=$copied${sep}gnulib.mk; sep=$nl
+        copied=$copied${sep}$gnulib_mk; sep=$nl
 	remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
-        sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/gnulib.mk || {
-	  echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
-	  rm -f $dir/gnulib.mk &&
-	  sed "$remove_intl" $1/$dir/$file >$dir/gnulib.mk
+        sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/$gnulib_mk || {
+	  echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+	  rm -f $dir/$gnulib_mk &&
+	  sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
 	}
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
 	   version_controlled_file $dir $file; then
@@ -435,14 +455,21 @@ slurp() {
       fi || exit
     done
 
-    for dot_ig in .cvsignore .gitignore; do
+    for dot_ig in x $vc_ignore; do
+      test $dot_ig = x && continue
       ig=$dir/$dot_ig
-      if test -n "$copied" && test -f $ig; then
+      if test -n "$copied"; then
 	insert_sorted_if_absent $ig "$copied"
-	# If an ignored file name ends with _.h, then also add
+	# If an ignored file name ends with .in.h, then also add
 	# the name with just ".h".  Many gnulib headers are generated,
-	# e.g., stdint_.h -> stdint.h, dirent_.h ->..., etc.
-	f=`echo "$copied"|sed 's/_\.h$/.h/'`
+	# e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
+	# Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
+	f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
+	insert_sorted_if_absent $ig "$f"
+
+	# For files like sys_stat.in.h and sys_time.in.h, record as
+	# ignorable the directory we might eventually create: sys/.
+	f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
 	insert_sorted_if_absent $ig "$f"
       fi
     done
@@ -465,7 +492,7 @@ gnulib_tool_options="\
  --m4-base $bt/m4/\
  --source-base $bt/lib/\
  --tests-base $bt/tests\
- --local-dir gl\
+ --local-dir $local_gl_dir\
 $gnulib_tool_option_extras\
 "
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
@@ -473,7 +500,7 @@ $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
 slurp $bt || exit
 
 for file in $gnulib_files; do
-  symlink_to_gnulib $file || exit
+  symlink_to_dir "$GNULIB_SRCDIR" $file || exit
 done
 
 
@@ -491,12 +518,31 @@ if test $with_gettext = yes; then
   rm -fr $bt $bt2 || exit
 fi
 
+# Coreutils is unusual in that it generates some of its test-related
+# Makefile.am files.  That must be done before invoking automake.
+mam_template=tests/Makefile.am.in
+if test -f $mam_template; then
+  PERL=perl
+  for tool in cut head join pr sort tac tail test tr uniq wc; do
+    m=tests/$tool/Makefile.am
+    t=${m}t
+    rm -f $m $t
+    sed -n '1,/^##test-files-begin/p' $mam_template > $t
+    echo "x = $tool" >> $t
+    srcdir=tests/$tool
+    $PERL -I$srcdir -w -- tests/mk-script $srcdir --list >> $t
+    sed -n '/^##test-files-end/,$p' $mam_template >> $t
+    chmod -w $t
+    mv $t $m
+  done
+fi
 
 # Reconfigure, getting other files.
 
+aclocal_flags=`sed -n 's/ACLOCAL_AMFLAGS *=//p' Makefile.am`
 for command in \
   libtool \
-  'aclocal --force -I m4' \
+  "aclocal --force $aclocal_flags" \
   'autoconf --force' \
   'autoheader --force' \
   'automake --add-missing --copy --force-missing';
@@ -512,13 +558,13 @@ done
 
 
 # Get some extra files from gnulib, overriding existing files.
-
 for file in $gnulib_extra_files; do
   case $file in
   */INSTALL) dst=INSTALL;;
+  build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
   *) dst=$file;;
   esac
-  symlink_to_gnulib $file $dst || exit
+  symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
 done
 
 if test $with_gettext = yes; then
diff --git a/bootstrap.conf b/bootstrap.conf
index eccf177..4dc2998 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -24,7 +24,7 @@ avoided_gnulib_modules='
 
 # gnulib modules used by this package.
 gnulib_modules="$avoided_gnulib_modules
-`grep '^[^#]' build-aux/gnulib.modules`
+`grep '^[^#]' gnulib.modules`
 "
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
 XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
deleted file mode 100644
index 8d1fd5b..0000000
--- a/build-aux/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-config.guess
-config.rpath
-config.sub
-depcomp
-install-sh
-link-warning.h
-mdate-sh
-missing
-mkinstalldirs
-texinfo.tex
diff --git a/doc/.cvsignore b/doc/.gitignore
index bf6d398..bf6d398 100644
--- a/doc/.cvsignore
+++ b/doc/.gitignore
diff --git a/doc/rendition.texi b/doc/rendition.texi
index c1527c4..45ac068 100644
--- a/doc/rendition.texi
+++ b/doc/rendition.texi
@@ -39,10 +39,19 @@
 
 @c Output marks for nodes needing revision, but not in PUBLISH rendition.
 
+@macro WRITEME
+@ifclear PUBLISH
+@quotation
+@emph{This node is to be written.}
+@end quotation
+@end ifclear
+@end macro
+
 @macro UNREVISED
 @ifclear PUBLISH
 @quotation
-@emph{(This message will disappear, once this node revised.)}
+(@emph{The information in this node may be obsolete or otherwise inaccurate.}
+This message will disappear, once this node revised.)
 @end quotation
 @end ifclear
 @end macro
@@ -50,28 +59,27 @@
 @c Output various FIXME information only in PROOF rendition.
 
 @macro FIXME{string}
-@allow-recursion
-@quote-arg
 @ifset PROOF
 @ifset PROOF_FOOTNOTED
 @footnote{@strong{FIXME:} \string\}
 @end ifset
 @ifclear PROOF_FOOTNOTED
+@cartouche
 @strong{<FIXME>} \string\ @strong{</>}
+@end cartouche
 @end ifclear
 @end ifset
 
 @end macro
 
 @macro FIXME-ref{string}
-@quote-arg
 @ifset PROOF
 @strong{<REF>} \string\ @strong{</>}
 @end ifset
+
 @end macro
 
 @macro FIXME-pxref{string}
-@quote-arg
 @ifset PROOF
 @strong{<PXREF>} \string\ @strong{</>}
 @end ifset
@@ -79,8 +87,8 @@
 @end macro
 
 @macro FIXME-xref{string}
-@quote-arg
 @ifset PROOF
 @strong{<XREF>} \string\ @strong{</>}
 @end ifset
+
 @end macro
diff --git a/elisp/.cvsignore b/elisp/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/elisp/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/build-aux/gnulib.modules b/gnulib.modules
index f23e251..8c522d1 100644
--- a/build-aux/gnulib.modules
+++ b/gnulib.modules
@@ -1,4 +1,4 @@
-# List of gnulib modules needed for GNU mailutils.
+# List of gnulib modules needed for GNU cflow.
 # A module name per line. Empty lines and comments are ignored.
 
 argp
@@ -8,5 +8,6 @@ malloc
 error
 hash
 gettext
+gitlog-to-changelog
 snprintf
 version-etc
\ No newline at end of file
diff --git a/lib/.cvsignore b/lib/.cvsignore
deleted file mode 100644
index 077f288..0000000
--- a/lib/.cvsignore
+++ /dev/null
@@ -1,90 +0,0 @@
-*.[ch]
-.deps
-Makefile
-Makefile.am
-Makefile.in
-alloca.c
-alloca.h
-alloca_.h
-argp-ba.c
-argp-eexst.c
-argp-fmtstream.c
-argp-fmtstream.h
-argp-fs-xinl.c
-argp-help.c
-argp-namefrob.h
-argp-parse.c
-argp-pin.c
-argp-pv.c
-argp-pvh.c
-argp-xinl.c
-argp.h
-asnprintf.c
-basename.c
-dirname.c
-dirname.h
-dummy.c
-error.c
-error.h
-exitfail.c
-exitfail.h
-float+.h
-float.h
-float_.h
-getopt.c
-getopt.h
-getopt1.c
-getopt_.h
-getopt_int.h
-gettext.h
-gnulib.mk
-hash.c
-hash.h
-lstat.c
-lstat.h
-malloc.c
-mempcpy.c
-obstack.c
-obstack.h
-printf-args.c
-printf-args.h
-printf-parse.c
-printf-parse.h
-size_max.h
-sleep.c
-snprintf.c
-stdbool.h
-stdbool_.h
-stdint.h
-stdint_.h
-stdio.h
-stdio_.h
-stdlib.h
-stdlib_.h
-strcasecmp.c
-strchrnul.c
-string.h
-string_.h
-stripslash.c
-strncasecmp.c
-strndup.c
-strnlen.c
-sys_stat.h
-sys_stat_.h
-sysexits.h
-sysexits_.h
-unistd.h
-unistd_.h
-vasnprintf.c
-vasnprintf.h
-version-etc.c
-version-etc.h
-vsnprintf.c
-wchar.h
-wchar_.h
-xalloc-die.c
-xalloc.h
-xmalloc.c
-xsize.h
-xstrndup.c
-xstrndup.h
diff --git a/po/.cvsignore b/po/.gitignore
index 4c7a183..25091c1 100644
--- a/po/.cvsignore
+++ b/po/.gitignore
@@ -1,3 +1,4 @@
+.reference
 *.gmo
 *.mo
 *.po
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 3f2c0d7..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makevars
-.deps
-Makefile
-Makefile.in
-c.c
-cflow
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..6196459
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,2 @@
+c.c
+cflow
diff --git a/tests/.cvsignore b/tests/.gitignore
index 73a6020..93f8f46 100644
--- a/tests/.cvsignore
+++ b/tests/.gitignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
 atconfig
 atlocal
 package.m4