various fixlets

diff --git a/ChangeLog b/ChangeLog
index ff7adf6098e94fb6c7e8fc0f410a1cc772be4ce1..9460a6c39ff8d16f336938217ad36c6fccdb6021 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sun May 17 23:05:55 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * aclocal.in (write_aclocal): Fixed generated copyright message.
+       From Eleftherios Gkioulekas.
+
+       * automake.in (parse_arguments): Typo fix from Paul D. Smith.
+
+Fri May  8 12:14:03 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_yacc_lex_cxx): Put lex and yacc output files
+       onto @clean.
+
 Wed May  6 01:18:05 1998  Tom Tromey  <tromey@cygnus.com>
 
        * header-vars.am (DESTDIR): Changed from DISTDIR.

diff --git a/THANKS b/THANKS
index b2494940c06ec04340d67e6510d19f9d60bc2743..b8f0eb0afb8911d82dc295d531c3807ada3b0f40 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -15,6 +15,7 @@ David A. Swierczek    swiercze@mr.med.ge.com
 David Zaroski          cz253@cleveland.Freenet.Edu
 Dieter Baron           dillo@stieltjes.smc.univie.ac.at
 Doug Evans             devans@cygnus.com
+Eleftherios Gkioulekas lf@amath.washington.edu
 Erick Branderhorst     branderh@iaehv.nl
 François Pinard                pinard@iro.umontreal.ca
 Fred Fish              fnf@ninemoons.com

diff --git a/TODO b/TODO
index cebe98f38932c8dc91bd29655e82a880c9e12a37..bd6c3f5ebe534f16ab2635cd8a548c646fc9dae7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -25,6 +25,9 @@
 * Every program foo has FOOFLAGS right now.
   It should also have AM_FOOFLAGS, which can be set in Makefile.am.
 
+* Should have a --copy like libtoolize
+  Should be able to update files that would be installed with -a
+
 * when cleaning, should recurse depth first
 
 * quoting bugs

diff --git a/aclocal.in b/aclocal.in
index a53fb69803391ed8d1b3e7fb9db89e0a7eba85ae..85cc49b595e664bd57d5c5b4ef44d00c6b2bec3e 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -407,7 +407,7 @@ sub write_aclocal
     print ACLOCAL "dnl $output_file generated automatically by aclocal $VERSION\n";
     print ACLOCAL "\
 dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
+dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 

diff --git a/automake.in b/automake.in
index 91289aa9c339f2ad249f4e46ec3e3fc01275f429..cf9bc812ff72ec03f409b5ece5c4efd9b449fc0c 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -409,7 +409,7 @@ sub parse_arguments
        }
        elsif ($arglist[0] eq '--generate-deps')
        {
-           $generate_deps = $1;
+           $generate_deps = 1;
        }
        elsif ($arglist[0] eq '--no-force')
        {
@@ -886,6 +886,11 @@ sub handle_yacc_lex_cxx
            ($hname = $2) =~ tr/y/h/;
            ($cname = $2) =~ tr/y/c/;
            $output_rules .= "${base}.${hname}: ${base}.${cname}\n";
+
+           # If the files are built in the build directory, then we
+           # want to remove them with `make clean'.  If they are in
+           # srcdir they shouldn't be touched.
+           push (@clean, $base . $hname, $base . $cname);
        }
        $output_rules .= "\n";
 
@@ -902,12 +907,20 @@ sub handle_yacc_lex_cxx
     if ($lex_count)
     {
        local (%seen_suffix) = ();
-       foreach (keys %lex_sources)
+       local ($file, $cname);
+       foreach $file (keys %lex_sources)
        {
-           /(\..*)$/;
+           $file =~ /(\..*)$/;
            &output_lex_build_rule ($1, $lex_count > 1)
                if (! defined $seen_suffix{$1});
            $seen_suffix{$1} = 1;
+
+           # If the files are built in the build directory, then we
+           # want to remove them with `make clean'.  If they are in
+           # srcdir they shouldn't be touched.
+           $file =~ /^(.*)\.(l|ll|l\+\+|lxx)$/;
+           ($cname = $2) =~ tr/y/c/;
+           push (@clean, $1 . $cname);
        }
 
        if (! defined $configure_vars{'LEX'})