Update docs

9 files changed, 78 insertions, 93 deletions

diff --git a/.gitignore b/.gitignore
index 196d4d9..e5d7fda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,4 @@
 ABOUT-NLS
-INSTALL
 ChangeLog
+INSTALL
 Makefile
diff --git a/Makefile.am b/Makefile.am
index b491182..ce24bbd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,2 @@
 
-AUTOMAKE_OPTIONS = gnits 1.8 dist-bzip2
 ACLOCAL_AMFLAGS = -I m4
diff --git a/NEWS b/NEWS
index a086366..5ee74e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,3 @@
-GNU cflow NEWS -- history of user-visible changes. 2007-06-29
-Copyright (C) 2005, 2006, 2007 Sergey Poznyakoff
+GNU cflow NEWS -- history of user-visible changes. 2009-02-06
+Copyright (C) 2005, 2006, 2007, 2009 Sergey Poznyakoff
 See the end of file for copying conditions.
@@ -5,2 +5,5 @@ See the end of file for copying conditions.
 Please send cflow bug reports to <bug-cflow@gnu.org>.
+
+
+Version 1.2.90 (Git)
 
@@ -57,3 +60,3 @@ Initial version restored from 1997 snapshots.
 
-Copyright (C) 2005, 2006 Sergey Poznyakoff
+Copyright (C) 2005, 2006, 2007, 2009 Sergey Poznyakoff
 
diff --git a/README-alpha b/README-alpha
index 46c3a00..8abeae8 100644
--- a/README-alpha
+++ b/README-alpha
@@ -2,3 +2,3 @@ This is the GNU cflow package.
 This document describes the actions needed to build the pre-release
-or CVS version of the package. See end of file for copying conditions.
+or GIT version of the package. See end of file for copying conditions.
 
@@ -6,12 +6,12 @@ or CVS version of the package. See end of file for copying conditions.
 
-This is a *pre-release* version, and not ready for production use yet. If you
-are taking source from CVS, you will need to have automake, and
-autoconf installed to bootstrap the package. See the chapter `Building' for
-the detailed instructions. After bootstrapping, there should be a file
-'INSTALL' with generic installation instructions. Package-specific
-installation instructions are set forth in the file README.
+This is a *pre-release* version, and not ready for production use yet.
+If you are taking source from Git, you will need to have several
+special tools to help contribute.  See the file README-hacking for more
+information.  See chapter `Building' for the detailed instructions on
+how to build the package.
 
-Please, note that the accompanying documentation may be inaccurate or
-incomplete (well, to say the truth it is absent. See TODO for more info).
-The ChangeLog file is the authoritative documentation for all recent changes.
+Please, note that the accompanying documentation may be inaccurate
+or incomplete. The git lot is the authoritative documentation of
+all recent changes. You may convert it to a traditional ChangeLog by
+running `make ChangeLog'.
 
@@ -22,10 +22,11 @@ Report bugs to <bug-cflow@gnu.org>
 The following instructions apply if you wish to obtain sources from
-the CVS repository:
+the GIT repository:
 
-To checkout the source tree from CVS issue the following command:
+To clone the GNU cflow repository, issue the following command:
 
-CVS_RSH=ssh \
- cvs -d :ext:anoncvs@cvs.savannah.gnu.org:/cvsroot/cflow checkout cflow
+  git clone git://git.savannah.gnu.org/cflow.git
 
-Make sure SSHv2 is used.
+or
+
+  git clone http://git.sv.gnu.org/r/cflow.git
 
@@ -34,34 +35,15 @@ contact the mailing list.
 
-The CVS repository is also available via HTTP from
+For more information about Git access, visit
+http://savannah.gnu.org/git/?group=cflow
 
-    http://cvs.savannah.gnu.org/cgi-bin/viewcvs/cflow/cflow/
-    
 * Building
 
-If you have taken the sources from CVS you will need the following
-packages to build cflow.  I don't make any extra effort to accommodate
-older versions of these packages, so please make sure that you have the
-latest stable version.
-
-- Automake <http://www.gnu.org/software/automake/>
-- Autoconf <http://www.gnu.org/software/autoconf/>
-- Flex <http://flex.sourceforge.net/>
-- Gettext <http://www.gnu.org/software/gettext/>
-- Gnulib <http://www.gnu.org/software/gnulib/>
-- M4 <http://www.gnu.org/software/m4/>
-- Texinfo <http://www.gnu.org/software/texinfo>
-- Wget <http://www.gnu.org/software/wget/>
-
-To prepare the package for building run `build-aux/bootstrap' utility.
-For example: 
+Usual procedures apply:
 
- $ cd cflow
- $ build-aux/bootstrap
+ ./configure
+ make
+ make install
 
-If you have already checked out gnulib sources, use --gnulib-srcdir
-to specify their location, this will spare you time and bandwidth:
+See INSTALL and README for the detailed instructions.
 
- $ cd cflow
- $ build-aux/bootstrap --gnulib-srcdir=$HOME/gnu/gnulib
- 
 * Debugging
@@ -91,3 +73,3 @@ Now set your breakpoints and proceed as usual.
 
-Copyright (C) 2005, 2007 Sergey Poznyakoff
+Copyright (C) 2005, 2007, 2009 Sergey Poznyakoff
 
diff --git a/README-hacking b/README-hacking
index 8fd130a..5307d93 100644
--- a/README-hacking
+++ b/README-hacking
@@ -1,3 +1,3 @@
-These notes intend to help people working on the CVS version of
-this package.
+These notes intend to help people working on the GIT version of
+GNU cflow.
 
@@ -5,5 +5,7 @@ this package.
 
-Only the sources are installed in the CVS repository (to ease the
-maintenance, merges etc.), therefore you will have to get the latest
-stable versions of the maintainer tools we depend upon, including:
+Only the sources are installed in the GIT repository (to ease the
+maintenance, merges etc.), therefore you will need the following
+packages to build GNU cflow.  I don't make any extra effort to
+accommodate older versions of these packages, so please make sure that
+you have the latest stable version.
 
@@ -18,40 +20,32 @@ stable versions of the maintainer tools we depend upon, including:
 
-Only building the initial full source tree will be a bit painful,
-later, a plain `cvs update -P && make' should be sufficient.
-
-* First CVS checkout
+* Bootstrapping
 
 Obviously, if you are reading these notes, you did manage to check out
-this package from CVS.  The next step is to get other files needed to
-build, which are extracted from other source packages:
+the project from GIT. The next step is to get other files needed to build,
+which are extracted from other source packages: 
+
+1. Change to the source tree directory
+
+   cd cflow
 
-	$ build-aux/bootstrap
+2. Run
 
-If you already have checked out the gnulib sources, you can speed up
-the process by specifying their location using --gnulib-srcdir command
-line option:
+   ./bootstrap 
 
-        $ build-aux/bootstrap --gnulib-srcdir=$HOME/gnu/gnulib
+Once done, proceed as described in the file README (section
+INSTALLATION).
 
-If you plan to be hacking on cflow, it is probably that you will need
-to re-run bootstrap from time to time, for example after updating your
-gnulib copy in order to propagate the changes into cflow tree.  In
-these case we recommend to store bootstrap options in a file named
-.bootstrap, in the cflow root directory.  The format of this file is
-very simple: it contains bootstrap command line options separated by
-any amount of whitespace characters (i.e. spaces, tabs and newlines).
-Any line starting with a comment character `#' is ignored as well as
-are empty lines.  For example, if you plan to always use the same gnulib
-directory and to copy gnulib files instead of creating symbolic links
-to them, then your .bootstrap file would contain:
+Normally you will have to run bootstrap only once. However, if you
+intend to hack on GNU cflow, you might need to run it again later. In
+this case, you will probably want to save some time and bandwidth by
+avoiding downloading the same files again. If so, create in the project's
+root directory a file named `.bootstrap' with the following
+contents:
 
-       # Sample .bootstrap file
-       --gnulib-srcdir=$HOME/gnu/gnulib
-       --copy
+   --gnulib-srcdir=$HOME/gnulib
 
-Once you have bootstrapped the source tree, run:
+Replace `$HOME/gnulib' with the actual directory where the Gnulib
+sources reside.
 
-	$ ./configure
-	$ make
-	$ make check
+For more information about `bootstrap', run `bootstrap --help'.
 
@@ -61,4 +55,4 @@ Enjoy!
 
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
-Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007,
+2009 Free Software Foundation, Inc.
 
diff --git a/configure.ac b/configure.ac
index 93e5c1f..052e13f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,3 @@
 # This file is part of GNU cflow
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
 #
@@ -20,7 +20,7 @@
 
-AC_PREREQ(2.59)
-AC_INIT([GNU cflow], [1.2], [bug-cflow@gnu.org])
+AC_PREREQ(2.61)
+AC_INIT([GNU cflow], [1.2.90], [bug-cflow@gnu.org])
 AC_CONFIG_SRCDIR([src/cflow.h])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 gnits tar-ustar dist-bzip2 std-options])
 AC_CONFIG_HEADER([config.h])
@@ -59,8 +59,9 @@ AC_SUBST(lisp_LISP)
 # Gettext.
+AM_ICONV
 AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION(0.16)
+AM_GNU_GETTEXT_VERSION(0.17)
 
-# Doc hints.
 # Select a rendition level:
 #  DISTRIB for stable releases (at most one dot in the version number)
+#  and maintenance releases (two dots, patchlevel < 50)
 #  PROOF for alpha releases.
@@ -70,2 +71,7 @@ case `echo $VERSION|sed  's/[[^.]]//g'` in
 ""|".")  RENDITION=DISTRIB;;
+"..")  if test `echo $VERSION | sed  's/.*\.//'` -lt 50; then
+	 RENDITION=DISTRIB
+       else
+         RENDITION=PROOF
+       fi;;
 *)     RENDITION=PROOF;;
diff --git a/gnulib.modules b/gnulib.modules
index 8c522d1..5c5e1dc 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -9,3 +9,3 @@ error
 hash
-gettext
+gettext-h
 gitlog-to-changelog
diff --git a/po/.gitignore b/po/.gitignore
index 25091c1..ee5203b 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,2 +1 @@
-.reference
 *.gmo
@@ -4,2 +3,3 @@
 *.po
+.reference
 LINGUAS
@@ -16,2 +16,3 @@ en@boldquot.header
 en@quot.header
+insert-header.sed
 insert-header.sin
diff --git a/src/Makefile.am b/src/Makefile.am
index 3f8e0fb..2ca13e5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
 # This file is part of GNU cflow
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
 #
@@ -37,3 +37,3 @@ localedir = $(datadir)/locale
 
-cflow_LDADD=../lib/libcflow.a $(LIBINTL)
+cflow_LDADD=../lib/libcflow.a @LIBINTL@
 AM_CPPFLAGS=-DLOCALEDIR=\"$(localedir)\"