* Makefile.am (EXTRA_DIST): Removed automake.spec.in. From

        Matthew D. Langston.
        (info_TEXINFOS): Removed am-f77.texi.
        * automake.in (handle_ltlibraries): Allow `noinst' LTLIBRARIES.
        These are libtool convenience libraries.

diff --git a/ChangeLog b/ChangeLog
index ccaa4b989684f19658b1f5be657b169d9113a3d6..5c78f6eee81c630be9f45212e379cb1106fcce45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-10-16  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.am (EXTRA_DIST): Removed automake.spec.in.  From
+       Matthew D. Langston.
+       (info_TEXINFOS): Removed am-f77.texi.
+
+       * automake.in (handle_ltlibraries): Allow `noinst' LTLIBRARIES.
+       These are libtool convenience libraries.
+
 1998-10-13  Tom Tromey  <tromey@cygnus.com>
 
        * m4/f77.m4: New file.

diff --git a/Makefile.am b/Makefile.am
index 1fbd723c3b5e331799e32ab3b1903061546e29fc..8c06ade478c61f827bbba7bc952088571ced3401 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
 pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh missing \
 mkinstalldirs elisp-comp ylwrap acinstall
 
-EXTRA_DIST = acinstall $(pkgdata_DATA) automake.spec.in
+EXTRA_DIST = acinstall $(pkgdata_DATA)
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \

diff --git a/Makefile.in b/Makefile.in
index a0c9460251065936666c4e84b4cde7c4de605ecb..a8496e39c976074148c676737ffc533051cfba69 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,7 +87,7 @@ pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
 pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh missing \
 mkinstalldirs elisp-comp ylwrap acinstall
 
-EXTRA_DIST = acinstall $(pkgdata_DATA) automake.spec.in
+EXTRA_DIST = acinstall $(pkgdata_DATA)
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \

diff --git a/automake.in b/automake.in
index fc2e362199893b8d66e80b9fc1906aee871d0ed8..d997dee3704aed4d184107f01186060964cc6901 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1617,7 +1617,7 @@ sub handle_ltlibraries
 {
     local (@liblist) = &am_install_var ('-clean',
                                        'ltlib', 'LTLIBRARIES',
-                                       'lib', 'pkglib');
+                                       'noinst', 'lib', 'pkglib');
     return if ! @liblist;
 
     local (%instdirs);
@@ -1718,7 +1718,7 @@ sub handle_ltlibraries
        }
 
        local ($rpath);
-       if ($instdirs{$onelib} eq 'EXTRA')
+       if ($instdirs{$onelib} eq 'EXTRA' || $instdirs{$onelib} eq 'noinst')
        {
            # It's an EXTRA_ library, so we can't specify -rpath,
            # because we don't know where the library will end up.

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 1fbd723c3b5e331799e32ab3b1903061546e29fc..8c06ade478c61f827bbba7bc952088571ced3401 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -29,7 +29,7 @@ pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
 pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh missing \
 mkinstalldirs elisp-comp ylwrap acinstall
 
-EXTRA_DIST = acinstall $(pkgdata_DATA) automake.spec.in
+EXTRA_DIST = acinstall $(pkgdata_DATA)
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 7a7f12e5c8b2bcdfb69be2c311531d9650cf78ca..19715744a36d26e95544a77741831d28f6eaf921 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -67,8 +67,8 @@ AUTOMAKE_OPTIONS = gnits
 MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 \
-lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 multi.m4 \
+m4data_DATA = ccstdc.m4 cond.m4 dmalloc.m4 error.m4 f77.m4 header.m4 \
+init.m4 lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 multi.m4 \
 obstack.m4 protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 \
 termios.m4 winsz.m4
 
@@ -150,7 +150,7 @@ install-data-am: install-m4dataDATA
 install-data: install-data-am
 
 install-am: all-am
-       $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
 uninstall-am: uninstall-m4dataDATA
 uninstall: uninstall-am