*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 10b3511ea1cb06c6982284ba0248977fe9e592d5..50e37880d79633d022678f5dac0c7571d5050d11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 Wed Jun 11 11:04:59 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
        * Makefile.am (ltconfig, ltmain.sh): Only move if $(srcdir) is not
-       the current directory.  Reported by Tom Tromey.
+       the current directory.  Don't regenerate every time the package is
+       reconfigured.  Reported by Tom Tromey.
+       (MAINTAINERCLEANFILES): Added ltconfig, ltmain.sh, so that
+       $(srcdir) is not messed with during a regular clean.
 
 Tue Jun 10 12:26:00 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 

diff --git a/Makefile.am b/Makefile.am
index ca2a6584a51d7392283cf8cac78217b046b391ec..31b50c6950e226565f207c17fc5ea44e4e9184e6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ aclocal_macros = libtool.m4
 
 EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.sh.in \
        README-automake libtool.prj
-CLEANFILES = libtool libtoolize ltconfig ltmain.sh
+CLEANFILES = libtool libtoolize
+MAINTAINERCLEANFILES = ltconfig ltmain.sh
 
 # Files in the demo subdirectory that go in the distribution.
 demo_distfiles = demo/Makefile.in demo/Makefile.am demo/README \
@@ -36,19 +37,21 @@ libtool: ltconfig
        LD="${LD}" RANLIB="${RANLIB}" \
        $(srcdir)/ltconfig --srcdir=$(srcdir) $(pkgdatadir)/ltmain.sh
 
-# These depend on config.status for version numbers.
 libtoolize: libtoolize.in $(top_builddir)/config.status
        CONFIG_FILES=libtoolize CONFIG_HEADERS= $(top_builddir)/config.status
        chmod +x libtoolize
 
-$(srcdir)/ltconfig: ltconfig.in $(top_builddir)/config.status
+# These depend on NEWS (rather then config.status) so that version numbers
+# are correctly updated.
+# This way, they aren't regenerated after people configure the package.
+$(srcdir)/ltconfig: ltconfig.in NEWS
        CONFIG_FILES=ltconfig CONFIG_HEADERS= $(top_builddir)/config.status
        chmod +x ltconfig
-       mv ltconfig $(srcdir)/ltconfig
+       test "$(srcdir)" = . || mv ltconfig $(srcdir)/ltconfig
 
-$(srcdir)/ltmain.sh: ltmain.sh.in $(top_builddir)/config.status
+$(srcdir)/ltmain.sh: ltmain.sh.in NEWS
        CONFIG_FILES=ltmain.sh CONFIG_HEADERS= $(top_builddir)/config.status
-       mv ltmain.sh $(srcdir)/ltmain.sh
+       test "$(srcdir)" = . || mv ltmain.sh $(srcdir)/ltmain.sh
 
 # Distribute the demo subdirectory.
 dist-hook: $(demo_distfiles)

diff --git a/NEWS b/NEWS
index 36662eec91d69c0a05071a717082818829f0598e..875c43a9341509a1bcac1925398a2c0ae9cc4529 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 NEWS - list of user-visible changes between releases of GNU libtool.
 
-New in 0.9g:
+New in 0.9h:
 * Bug fixes.
 * Automake support for Libtool now uses the LTLIBRARIES primary.  See
   the Automake documentation for more information.

diff --git a/configure.in b/configure.in
index 822a89a872313ce983df120838807d72afeb3965..9080fcca9dfd9b0d504082544e0fff2538bd8a76 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to create configure.
 AC_INIT(ltmain.sh.in)
-AM_INIT_AUTOMAKE(libtool,0.9g)
+AM_INIT_AUTOMAKE(libtool,0.9h)
 
 pkgdatadir='${datadir}/libtool'
 AC_SUBST(pkgdatadir)

diff --git a/doc/libtool.texi b/doc/libtool.texi
index 1e31f60d49f67a468ad42012dc3f40f3fae05b5a..574cf71fac3fb1a14ffe52a850bf8edbe89ee4a7 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1021,9 +1021,11 @@ libtool libraries may not depend on other uninstalled libtool libraries
 If the @var{output-file} ends in @samp{.a}, then a standard library is
 created using @code{ar} and possibly @code{ranlib}.
 
+@cindex Partial linking
+@cindex Linking, partial
 If @var{output-file} ends in @samp{.o} or @samp{.lo}, then a reloadable object
 file is created from the input files (generally using @samp{ld -r}).
-This method is called @dfn{incremental linking}.
+This method is often called @dfn{partial linking}.
 
 Otherwise, an executable program is created.