.r3_2b

14 files changed, 96 insertions, 94 deletions

diff --git a/ChangeLog b/ChangeLog
index 31f4497..317fdad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1999-03-29  Greg McGary  <gkm@gnu.org>
 
+	* Version 3.2b released.
+
 	* libidu/idfile.h (struct member_file) [mf_index]: Change
 	type to long.
 	* libidu/scanners.h (MAX_LEVELS): Remove constant.
diff --git a/Makefile.in b/Makefile.in
index d2442ac..6da3099 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -93,6 +92,7 @@ VERSION = @VERSION@
 l = @l@
 lispdir = @lispdir@
 
+
 AUTOMAKE_OPTIONS = gnits 1.2h
 
 SUBDIRS = lib libidu intl src lisp m4 po doc testsuite
@@ -198,7 +198,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
diff --git a/NEWS b/NEWS
index 3dea56a..3b02d61 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 id-utils NEWS - User visible changes.
 
-Version 3.2a - March 29, 1999, by Greg McGary
+Version 3.2b - March 29, 1999, by Greg McGary
 
 * Fixed assorted bugs
 
diff --git a/TODO b/TODO
index 742f07b..2314b3e 100644
--- a/TODO
+++ b/TODO
@@ -6,6 +6,8 @@ id-utils TODO - Future directions
   - Fix assumption that (sizeof (int) == sizeof (long))
   - Integrate changes for MSDOS via djgpp
   - Port to cygwin
+  - configure gcc warning flags
+  - remove arbitrary buffer-size limits and unsafe libc functions (e.g., gets)
 
 * lid
   - use "long long" (if available) integer comparisons
@@ -17,7 +19,6 @@ id-utils TODO - Future directions
     you can index and search archived source without having to unpack it.
 
 * mkid
-  - relax static limit on maximum number of files (currently 32768)
   - (Optinally?) store tokenized contents of comments.
   - Store attributes with symbols: type, func, variable struct-tag
     enum-tag, keyword, etc.  Store caller/callee relationships between
@@ -26,6 +27,7 @@ id-utils TODO - Future directions
   - Add times(2) results to statistics output.
   - treat \ specially for TeX files and do likewise with @ for Texinfo.
   - report dangling symlinks as such, rather than just saying "can't stat"
+  - don't gripe about dangling symlinks if file won't be scanned anyway
   - Reinstate "-" on command-line, meaning read stdin for newline-separated args.
 
 * gscope
diff --git a/aclocal.m4 b/aclocal.m4
index b46c5aa..f3db783 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -263,7 +263,7 @@ AC_DEFUN(AM_FUNC_OBSTACK,
  if test $am_cv_func_obstack = yes; then
    AC_DEFINE(HAVE_OBSTACK,1,[Define if libc includes obstacks])
  else
-   LIBOBJS="$LIBOBJS obstack.o"
+   LIBOBJS="$LIBOBJS obstack.$ac_objext"
  fi
 ])
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0585975..6fd5f64 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -77,7 +76,6 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -94,6 +92,7 @@ VERSION = @VERSION@
 l = @l@
 lispdir = @lispdir@
 
+
 info_TEXINFOS = id-utils.texi
 
 EXTRA_DIST = texinfo.tex
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1d3bc7b..5efac45 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -93,6 +92,7 @@ VERSION = @VERSION@
 l = @l@
 lispdir = @lispdir@
 
+
 AUTOMAKE_OPTIONS = ../src/ansi2knr
 
 noinst_LIBRARIES = libsys.a
diff --git a/libidu/Makefile.in b/libidu/Makefile.in
index a14844e..fd8e785 100644
--- a/libidu/Makefile.in
+++ b/libidu/Makefile.in
@@ -128,7 +128,7 @@ DATA =  $(idu_DATA)
 
 HEADERS =  $(noinst_HEADERS)
 
-DIST_COMMON =  Makefile.am Makefile.in ansi2knr.1 ansi2knr.c
+DIST_COMMON =  Makefile.am Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 263c83d..070669e 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -77,7 +76,6 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -94,10 +92,13 @@ VERSION = @VERSION@
 l = @l@
 lispdir = @lispdir@
 
+
 EXTRA_DIST = id-utils.el elisp-comp
 elc_SCRIPTS = id-utils.elc
 elcdir = @LISPDIR@
 SUFFIXES = .el .elc
+
+DISTCLEANFILES = id-utils.elc
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -200,6 +201,7 @@ clean-generic:
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-generic
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 3352ebf..4e754f0 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -77,7 +76,6 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -94,6 +92,7 @@ VERSION = @VERSION@
 l = @l@
 lispdir = @lispdir@
 
+
 EXTRA_DIST = README Makefile.am.in gettext.m4 lcmessage.m4 progtest.m4
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/po/de.po b/po/de.po
index 21db929..7672c6a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
-"POT-Creation-Date: 1999-03-28 02:08-0700\n"
+"POT-Creation-Date: 1999-03-29 01:16-0700\n"
 "PO-Revision-Date: 1996-03-23 22:34 MET\n"
 "Last-Translator: Karl Eichwalder <ke@ke.Central.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -36,7 +36,7 @@ msgstr ""
 msgid "can't determine the io_size of a string!"
 msgstr ""
 
-#: libidu/idread.c:45 src/mkid.c:386 src/xtokid.c:215
+#: libidu/idread.c:45 src/mkid.c:406 src/xtokid.c:215
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -66,45 +66,45 @@ msgstr ""
 msgid "unsupported size in io_write (): %d"
 msgstr "Nicht unterstützte Größe (`size') in \"io_write ()\": %d"
 
-#: libidu/scanners.c:94
+#: libidu/scanners.c:95
 #, fuzzy, c-format
 msgid "unrecognized language: `%s'"
 msgstr "Kein Scanner für die Sprache '%s'"
 
-#: libidu/scanners.c:140
+#: libidu/scanners.c:141
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:194 libidu/scanners.c:263
+#: libidu/scanners.c:195 libidu/scanners.c:264
 msgid "can't allocate language args: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:202
+#: libidu/scanners.c:203
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:257
+#: libidu/scanners.c:258
 #, fuzzy, c-format
 msgid "can't open language map file `%s'"
 msgstr "Kein Scanner für die Sprache '%s'"
 
-#: libidu/scanners.c:259
+#: libidu/scanners.c:260
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:269
+#: libidu/scanners.c:270
 #, fuzzy, c-format
 msgid "can't read language map file `%s'"
 msgstr "Kein Scanner für die Sprache '%s'"
 
-#: libidu/scanners.c:272
+#: libidu/scanners.c:273
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:413
+#: libidu/scanners.c:418
 msgid ""
 "C language:\n"
 "  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the "
@@ -115,17 +115,17 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:682 libidu/scanners.c:986 libidu/scanners.c:1189
+#: libidu/scanners.c:687 libidu/scanners.c:991 libidu/scanners.c:1194
 #, c-format
 msgid "junk: `%c'"
 msgstr "\"junk\": '%c'"
 
-#: libidu/scanners.c:684 libidu/scanners.c:988 libidu/scanners.c:1191
+#: libidu/scanners.c:689 libidu/scanners.c:993 libidu/scanners.c:1196
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "\"junk\": '\\%03o'"
 
-#: libidu/scanners.c:788
+#: libidu/scanners.c:793
 msgid ""
 "Assembly language:\n"
 "  -c,--comment=CHARS     Any of CHARS starts a comment until end-of-line\n"
@@ -135,7 +135,7 @@ msgid ""
 "  -n,--no-cpp            Don't handle C pre-processor directives\n"
 msgstr ""
 
-#: libidu/scanners.c:1092
+#: libidu/scanners.c:1097
 msgid ""
 "Text language:\n"
 "  -i,--include=CHAR-CLASS  Treat characters of CHAR-CLASS as token "
@@ -245,7 +245,7 @@ msgstr ""
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:120 src/xtokid.c:43
+#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:121 src/xtokid.c:43
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
@@ -400,12 +400,12 @@ msgstr ""
 msgid "can't match regular-expression: memory exhausted"
 msgstr ""
 
-#: src/mkid.c:145 src/xtokid.c:64
+#: src/mkid.c:146 src/xtokid.c:64
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
 msgstr ""
 
-#: src/mkid.c:149
+#: src/mkid.c:150
 msgid ""
 "Build an identifier database.\n"
 "  -o, --output=OUTFILE    file name of ID database output\n"
@@ -431,98 +431,98 @@ msgid ""
 "The following arguments apply to the language-specific scanners:\n"
 msgstr ""
 
-#: src/mkid.c:312
+#: src/mkid.c:332
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr ""
 
-#: src/mkid.c:316
+#: src/mkid.c:336
 #, c-format
 msgid "can't modify `%s'"
 msgstr ""
 
-#: src/mkid.c:369
+#: src/mkid.c:389
 #, c-format
 msgid "can't stat `%s'"
 msgstr ""
 
-#: src/mkid.c:435
+#: src/mkid.c:455
 #, fuzzy, c-format
 msgid "  new = %d/%d"
 msgstr ", new=%d/%d"
 
-#: src/mkid.c:444
+#: src/mkid.c:464
 #, c-format
 msgid "Name=%ld, "
 msgstr "Name=%ld, "
 
-#: src/mkid.c:445
+#: src/mkid.c:465
 #, c-format
 msgid "Number=%ld, "
 msgstr "Zahl=%ld, "
 
-#: src/mkid.c:446
+#: src/mkid.c:466
 #, c-format
 msgid "String=%ld, "
 msgstr "Zeichenkette=%ld, "
 
 # ist das gemeint? ###
-#: src/mkid.c:447
+#: src/mkid.c:467
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Zeichen=%ld, "
 
-#: src/mkid.c:448
+#: src/mkid.c:468
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Kommentar=%ld\n"
 
-#: src/mkid.c:450
+#: src/mkid.c:470
 #, fuzzy, c-format
 msgid "Files=%d, "
 msgstr "Dateien=%d, "
 
-#: src/mkid.c:451
+#: src/mkid.c:471
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Tokens=%ld, "
 
-#: src/mkid.c:452
+#: src/mkid.c:472
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Bytes=%ld Kb, "
 
-#: src/mkid.c:453
+#: src/mkid.c:473
 #, fuzzy, c-format
 msgid "Heap=%ld+%ld Kb, "
 msgstr "\"Heap\"=%ld Kb, "
 
-#: src/mkid.c:455
+#: src/mkid.c:475
 #, c-format
 msgid "Output=%ld (%ld tok, %ld hit)\n"
 msgstr "Ausgabe=%ld (%ld tok, %ld hit)\n"
 
 # Frequenz übersetzen? ke
-#: src/mkid.c:458
+#: src/mkid.c:478
 #, fuzzy, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr "\"Freq\"=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:481
+#: src/mkid.c:501
 msgid "Sorting tokens...\n"
 msgstr "Sortiere \"Token\"...\n"
 
-#: src/mkid.c:487
+#: src/mkid.c:507
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "Schreibe '%s'...\n"
 
-#: src/mkid.c:490
+#: src/mkid.c:510
 #, c-format
 msgid "can't create `%s'"
 msgstr ""
 
-#: src/mkid.c:636
+#: src/mkid.c:656
 #, fuzzy
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "level %d: %ld == %ld\n"
diff --git a/po/fr.po b/po/fr.po
index 74cdc6c..4d541cf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-28 02:08-0700\n"
+"POT-Creation-Date: 1999-03-29 01:16-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,7 +47,7 @@ msgstr ""
 msgid "can't determine the io_size of a string!"
 msgstr ""
 
-#: libidu/idread.c:45 src/mkid.c:386 src/xtokid.c:215
+#: libidu/idread.c:45 src/mkid.c:406 src/xtokid.c:215
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -77,45 +77,45 @@ msgstr ""
 msgid "unsupported size in io_write (): %d"
 msgstr "Paramčtre taille passé ŕ io_write () non suporté: %d"
 
-#: libidu/scanners.c:94
+#: libidu/scanners.c:95
 #, fuzzy, c-format
 msgid "unrecognized language: `%s'"
 msgstr "Pas d'analyseur lexical pour le langag `%s'"
 
-#: libidu/scanners.c:140
+#: libidu/scanners.c:141
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:194 libidu/scanners.c:263
+#: libidu/scanners.c:195 libidu/scanners.c:264
 msgid "can't allocate language args: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:202
+#: libidu/scanners.c:203
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:257
+#: libidu/scanners.c:258
 #, fuzzy, c-format
 msgid "can't open language map file `%s'"
 msgstr "Pas d'analyseur lexical pour le langag `%s'"
 
-#: libidu/scanners.c:259
+#: libidu/scanners.c:260
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:269
+#: libidu/scanners.c:270
 #, fuzzy, c-format
 msgid "can't read language map file `%s'"
 msgstr "Pas d'analyseur lexical pour le langag `%s'"
 
-#: libidu/scanners.c:272
+#: libidu/scanners.c:273
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:413
+#: libidu/scanners.c:418
 msgid ""
 "C language:\n"
 "  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the "
@@ -126,17 +126,17 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:682 libidu/scanners.c:986 libidu/scanners.c:1189
+#: libidu/scanners.c:687 libidu/scanners.c:991 libidu/scanners.c:1194
 #, c-format
 msgid "junk: `%c'"
 msgstr "déchet: `%c'"
 
-#: libidu/scanners.c:684 libidu/scanners.c:988 libidu/scanners.c:1191
+#: libidu/scanners.c:689 libidu/scanners.c:993 libidu/scanners.c:1196
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "déchet: `\\%03o'"
 
-#: libidu/scanners.c:788
+#: libidu/scanners.c:793
 msgid ""
 "Assembly language:\n"
 "  -c,--comment=CHARS     Any of CHARS starts a comment until end-of-line\n"
@@ -146,7 +146,7 @@ msgid ""
 "  -n,--no-cpp            Don't handle C pre-processor directives\n"
 msgstr ""
 
-#: libidu/scanners.c:1092
+#: libidu/scanners.c:1097
 msgid ""
 "Text language:\n"
 "  -i,--include=CHAR-CLASS  Treat characters of CHAR-CLASS as token "
@@ -256,7 +256,7 @@ msgstr ""
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:120 src/xtokid.c:43
+#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:121 src/xtokid.c:43
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
@@ -409,12 +409,12 @@ msgstr ""
 msgid "can't match regular-expression: memory exhausted"
 msgstr ""
 
-#: src/mkid.c:145 src/xtokid.c:64
+#: src/mkid.c:146 src/xtokid.c:64
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
 msgstr ""
 
-#: src/mkid.c:149
+#: src/mkid.c:150
 msgid ""
 "Build an identifier database.\n"
 "  -o, --output=OUTFILE    file name of ID database output\n"
@@ -440,96 +440,96 @@ msgid ""
 "The following arguments apply to the language-specific scanners:\n"
 msgstr ""
 
-#: src/mkid.c:312
+#: src/mkid.c:332
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr ""
 
-#: src/mkid.c:316
+#: src/mkid.c:336
 #, c-format
 msgid "can't modify `%s'"
 msgstr ""
 
-#: src/mkid.c:369
+#: src/mkid.c:389
 #, c-format
 msgid "can't stat `%s'"
 msgstr ""
 
-#: src/mkid.c:435
+#: src/mkid.c:455
 #, fuzzy, c-format
 msgid "  new = %d/%d"
 msgstr ", nouveau=%d/%d"
 
-#: src/mkid.c:444
+#: src/mkid.c:464
 #, c-format
 msgid "Name=%ld, "
 msgstr "Nom=%ld, "
 
-#: src/mkid.c:445
+#: src/mkid.c:465
 #, c-format
 msgid "Number=%ld, "
 msgstr "Numéro=%ld, "
 
-#: src/mkid.c:446
+#: src/mkid.c:466
 #, c-format
 msgid "String=%ld, "
 msgstr "Chaîne=%ld, "
 
-#: src/mkid.c:447
+#: src/mkid.c:467
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Litéral=%ld, "
 
-#: src/mkid.c:448
+#: src/mkid.c:468
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Commentaire=%ld\n"
 
-#: src/mkid.c:450
+#: src/mkid.c:470
 #, fuzzy, c-format
 msgid "Files=%d, "
 msgstr "Fichiers=%d, "
 
-#: src/mkid.c:451
+#: src/mkid.c:471
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Unités lexicales=%ld, "
 
-#: src/mkid.c:452
+#: src/mkid.c:472
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Octets=%ld Kb, "
 
-#: src/mkid.c:453
+#: src/mkid.c:473
 #, fuzzy, c-format
 msgid "Heap=%ld+%ld Kb, "
 msgstr "tas=%ld Kb, "
 
-#: src/mkid.c:455
+#: src/mkid.c:475
 #, c-format
 msgid "Output=%ld (%ld tok, %ld hit)\n"
 msgstr "Sortie=%ld (%ld unités lexicales, %ld Touches)\n"
 
-#: src/mkid.c:458
+#: src/mkid.c:478
 #, fuzzy, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr "Freq=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:481
+#: src/mkid.c:501
 msgid "Sorting tokens...\n"
 msgstr "Tri unités lexicales...\n"
 
-#: src/mkid.c:487
+#: src/mkid.c:507
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "Écriture `%s'...\n"
 
-#: src/mkid.c:490
+#: src/mkid.c:510
 #, c-format
 msgid "can't create `%s'"
 msgstr ""
 
-#: src/mkid.c:636
+#: src/mkid.c:656
 #, fuzzy
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "niveau %d: %ld == %ld\n"
diff --git a/src/Makefile.in b/src/Makefile.in
index 0f50ad1..b700115 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -77,7 +76,6 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -94,6 +92,7 @@ VERSION = @VERSION@
 l = @l@
 lispdir = @lispdir@
 
+
 AUTOMAKE_OPTIONS = ansi2knr
 
 bin_PROGRAMS = mkid lid fid fnid xtokid
@@ -182,15 +181,15 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \
 	done
 
 .s.o:
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index a519c34..f0eb991 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -77,7 +76,6 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -94,6 +92,7 @@ VERSION = @VERSION@
 l = @l@
 lispdir = @lispdir@
 
+
 TESTS = consistency
 
 EXTRA_DIST = $(TESTS)