9 files changed, 97 insertions, 2329 deletions

diff --git a/ChangeLog b/ChangeLog
index 0fda28b..a0a5ca1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,13 +2,18 @@
 
         * bootstrap.conf: New file
         * build-aux/bootstrap: Replaced from the gnulib CVS
         * configure.ac: Update
         * po/Makevars: Remove automatically generated file
         * src/main.c: Remove #include <strndup.h>
-
+        * po/da.po, po/pl.po, po/uk.po, po/vi.po: Removed.  Translations
+        will be exported directly from TP.
+        * lib/Makefile.am: New file
+        * lib/Makefile.tmpl: Removed
+        * README-hacking: New file
+        
 2006-09-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         * src/main.c (doc): Reformat argp docstring in accordance with the
         new argp guidelines.  Remove unneeded translators comment.
         (main): Set program_name.
 
diff --git a/README-alpha b/README-alpha
index 6548cf6..23a2504 100644
--- a/README-alpha
+++ b/README-alpha
@@ -10,34 +10,34 @@ 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.
 
 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 of all recent changes.
+The ChangeLog file is the authoritative documentation for all recent changes.
 
 Report bugs to <bug-cflow@gnu.org>
 
 * Checking Out the Sources
 
 The following instructions apply if you wish to obtain sources from
 the CVS repository:
 
 To checkout the source tree from CVS issue the following command:
 
 CVS_RSH=ssh \
- cvs -d :ext:anoncvs@savannah.gnu.org:/cvsroot/cflow checkout cflow
+ cvs -d :ext:anoncvs@cvs.savannah.gnu.org:/cvsroot/cflow checkout cflow
 
 Make sure SSHv2 is used.
 
 This will give you read-only access.  If you think you need write access,
 contact the mailing list.
 
 The CVS repository is also available via HTTP from
 
-    http://savannah.gnu.org/cgi-bin/viewcvs/cflow/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
@@ -85,13 +85,13 @@ Once in gdb, issue the following command
         set _argp_hang=0
 
 Now set your breakpoints and proceed as usual.
 
 * Copyright information:
 
-Copyright (C) 2005 Sergey Poznyakoff
+Copyright (C) 2005, 2007 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
    copyright notice and this permission notice are preserved,
    thus giving the recipient permission to redistribute in turn.
 
diff --git a/README-hacking b/README-hacking
new file mode 100644
index 0000000..2b3e889
--- /dev/null
+++ b/README-hacking
@@ -0,0 +1,83 @@
+These notes intend to help people working on the CVS version of
+this package.
+
+* Requirements
+
+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:
+
+- Automake <http://www.gnu.org/software/automake/>
+- Autoconf <http://www.gnu.org/software/autoconf/>
+- 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/>
+
+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
+
+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:
+
+        $ build-aux/bootstrap
+
+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:
+
+        $ build-aux/bootstrap --gnulib-srcdir=$HOME/gnu/gnulib
+
+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:
+
+       # Sample .bootstrap file
+       --gnulib-srcdir=$HOME/gnu/gnulib
+       --copy
+
+Once you have bootstrapped the source tree, run:
+
+        $ ./configure
+        $ make
+        $ make check
+
+Enjoy!
+
+-----
+
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
+Inc.
+
+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 2, 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
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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.
+
+
+Local variables:
+mode: outline
+paragraph-separate: "[  ]*$"
+end:
diff --git a/lib/Makefile.tmpl b/lib/Makefile.am
index adf438a..78ec906 100644
--- a/lib/Makefile.tmpl
+++ b/lib/Makefile.am
@@ -14,19 +14,10 @@
 
 ## 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.
 
-noinst_LIBRARIES = libcflow.a
-noinst_HEADERS = argcv.h
-libcflow_a_SOURCES = argcv.c
-libcflow_a_LIBADD = $(LIBOBJS) $(ALLOCA)
-libcflow_a_DEPENDENCIES = $(libcflow_a_LIBADD)
-AM_CPPFLAGS=
-BUILT_SOURCES =
-EXTRA_DIST = Makefile.tmpl 
-MAINTAINERCLEANFILES =
-MOSTLYCLEANFILES =
-lib_OBJECTS = $(libcflow_a_OBJECTS)
+include gnulib.mk
 
-# gnulib modules
+noinst_HEADERS += argcv.h
+libcflow_a_SOURCES += argcv.c
diff --git a/po/.cvsignore b/po/.cvsignore
index e34e97e..95d22b6 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,8 +1,9 @@
 *.gmo
 *.mo
+*.po
 Makefile
 Makefile.in
 Makefile.in.in
 Makevars.template
 POTFILES
 Rules-quot
diff --git a/po/da.po b/po/da.po
deleted file mode 100644
index 3a2da6e..0000000
--- a/po/da.po
+++ /dev/null
@@ -1,590 +0,0 @@
-# Danish translations of the cflow message strings
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Morten Bo Johansen <mojo@mbjnet.dk>, 2005-
-msgid ""
-msgstr ""
-"Project-Id-Version: cflow 1.0\n"