various bug fixes

diff --git a/ChangeLog b/ChangeLog
index 9be62ef1b27348d7cd70a9d73feeb61a825771ac..2427659cbda8b78a5cc98703126fe990cd1460e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Tue Feb  4 18:29:42 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_lib_objects): Put @ALLOCA@ on @dep_list, not
+       @dep_files.
+       (AC_SUBST_PATTERN): Typo fix.
+       (handle_aclocal_m4): Use ACLOCAL_AMFLAGS.
+       (handle_clean): Put -recursive target before -am target.
+
+Tue Jan 28 22:19:04 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (initialize_global_constants): Put libtoolize files
+       into @common_files, not @common_sometimes.  From Gord Matzigkeit.
+
+Sun Jan 26 17:46:08 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * texinfos.am (.texi.info): If --cygnus, set -I $(srcdir).  From
+       Per Bothner.
+
 Tue Jan  7 18:35:10 1997  Tom Tromey  <tromey@cygnus.com>
 
        * aclocal.in (parse_arguments): Handle -I.

diff --git a/Makefile.in b/Makefile.in
index 4f96e63accab77626b7316c0444ed7070f1a6b1a..a778c488d4f69c941fcde79bf35ba8fbc0a0069d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,8 +38,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-PERL = @PERL@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
@@ -242,7 +242,7 @@ clean-info:
 distclean-info:
 
 maintainer-clean-info:
-       for i in $(INFO_DEPS); do rm `eval echo $$i*`; done
+       for i in $(INFO_DEPS); do rm -f `eval echo $$i*`; done
 
 install-pkgdataDATA: $(pkgdata_DATA)
        $(NORMAL_INSTALL)

diff --git a/TODO b/TODO
index 9aa291181ff65ebeca5a4f96f696efada1ec110d..8589b59a6c7b9ad6b5521aa84721b069e9507ae7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -13,6 +13,8 @@ non-C source in a libtool library specification.
 
 ================================================================
 
+rewrite in guile
+
 * finish up TAGS work
 * `acinstall'
 * `missing' program

diff --git a/automake.in b/automake.in
index 6646a54cca2d652f0817035cee8d7c6c9e80fd28..0f7d613188cf0915d4a8c852ae3624b566434aef 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -52,7 +52,7 @@ $AM_PACKAGE_VERSION_PATTERN = "^\\s*\\[?([^]\\s]+)\\]?\\s*\$";
 $AC_CHECK_PATTERN = "AC_(CHECK|PATH)_(PROG|PROGS|TOOL)\\(\\[?([^]),]+)";
 # Just check for alphanumeric in AC_SUBST.  If you do AC_SUBST(5),
 # then too bad.
-$AC_SUBST_PATTERN = "AC_SUBST\\(\\[?(\w+)";
+$AC_SUBST_PATTERN = "AC_SUBST\\(\\[?(\\w+)";
 
 # Constants to define the "strictness" level.
 $FOREIGN = 0;
@@ -1162,7 +1162,7 @@ sub handle_lib_objects
        }
        elsif ($lsearch eq '@ALLOCA@')
        {
-           push (@dep_files, $lsearch);
+           push (@dep_list, $lsearch);
            &am_line_error ($var,
                            "\@ALLOCA\@ seen but \`AC_FUNC_ALLOCA' not in \`configure.in'")
                if ! defined $libsources{'alloca.c'};
@@ -2316,6 +2316,8 @@ sub handle_aclocal_m4
                          . ($acinclude ? ' acinclude.m4' : '')
                          . "\n\t"
                          . 'cd $(srcdir) && aclocal'
+                         . (&variable_defined ('ACLOCAL_AMFLAGS')
+                            ? ' $(ACLOCAL_AMFLAGS)' : '')
                          . "\n");
     }
 }
@@ -2943,7 +2945,9 @@ sub handle_clean
     local (@deps);
     if ($recursive_install)
     {
-       @deps = ('am', 'recursive');
+       # Do -recursive before -am.  If you aren't doing a parallel
+       # make, this can be nicer.
+       @deps = ('recursive', 'am');
        &do_one_clean_target ('', 'mostly', '', @deps);
        &do_one_clean_target ('', '', '', @deps);
        &do_one_clean_target ('', 'dist', '', @deps);
@@ -4018,14 +4022,14 @@ sub initialize_global_constants
         "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU",
         "libversion.in", "mdate-sh", "mkinstalldirs", "install-sh",
         'texinfo.tex', "ansi2knr.c", "ansi2knr.1", 'elisp-comp',
-        'interlock', 'ylwrap', 'acinclude.m4'
+        'interlock', 'ylwrap', 'acinclude.m4', @libtoolize_files
         );
 
     # Commonly used files we auto-include, but only sometimes.
     @common_sometimes =
        (
         "aclocal.m4", "acconfig.h", "config.h.top",
-        "config.h.bot", "stamp-h.in", 'stamp-vti', @libtoolize_files
+        "config.h.bot", "stamp-h.in", 'stamp-vti'
         );
 
     $USAGE = "\

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 9dc69a7a316f06ee1af94786492d8ed8eb0375a6..edd4c25a14c4e5f828419e1dea04fec317c46cbc 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -22,7 +22,7 @@
 ## rule to use.
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS $(MAKEINFO) $<
+CYGNUS $(MAKEINFO) -I $(srcdir) $<
 
 .texi.dvi:
        TEXINPUTS=$(srcdir):$$TEXINPUTS \

diff --git a/m4/Makefile.in b/m4/Makefile.in
index d037c58bd32811a1bc7a3cea7a3f07e3ac4dec99..3a07d9573e0046290191fca4c85a5e1b436f989f 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -38,8 +38,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-PERL = @PERL@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a2dbfc61e293260b9bbb281d5e5e78aebb64783b..e9b893971436ec6494a2eca7cc67f8284b45493d 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb  4 18:41:32 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * ansi2.test: ANSI2KNR dependency of all.
+
 Tue Dec 10 00:43:14 1996  Tom Tromey  <tromey@cygnus.com>
 
        * defun2.test: New file.

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 39c38288f9689c6f6d749225ba9fcae81c1c19c9..c4228083c532a6ff635474889c6b5c8f1befab27 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -38,8 +38,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-PERL = @PERL@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits

diff --git a/tests/ansi2.test b/tests/ansi2.test
index c823822bd6f6a99a08eae3bbb73f6a81dc5c96fd..ae845594c3ccb965a706695c4bb6837cf5fe5b50 100755 (executable)
--- a/tests/ansi2.test
+++ b/tests/ansi2.test
@@ -19,4 +19,4 @@ END
 
 $AUTOMAKE || exit 1
 
-grep '^joe._o.*:.*ANSI2KNR' Makefile.in
+grep 'all:.*ANSI2KNR' Makefile.in

diff --git a/texinfos.am b/texinfos.am
index 9dc69a7a316f06ee1af94786492d8ed8eb0375a6..edd4c25a14c4e5f828419e1dea04fec317c46cbc 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -22,7 +22,7 @@
 ## rule to use.
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-CYGNUS $(MAKEINFO) $<
+CYGNUS $(MAKEINFO) -I $(srcdir) $<
 
 .texi.dvi:
        TEXINPUTS=$(srcdir):$$TEXINPUTS \