* configure.ac (AC_CONFIG_FILES): Generate libtoolize from here.

* Makefile.am (libtool, libtoolize): These rules are redundant.
Automake generates better rules for remaking these files.

diff --git a/ChangeLog b/ChangeLog
index 251d079dc1977a0461d614fad075d5e91a8ccc36..83e05da503f60063e67f5b891357ad576f0cdb1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-06  Gary V. Vaughan  <gary@gnu.org>
 
+       * configure.ac (AC_CONFIG_FILES): Generate libtoolize from here.
+       * Makefile.am (libtool, libtoolize): These rules are redundant.
+       Automake generates better rules for remaking these files.
+
        * m4/libtool.m4 (AC_LIBTOOL_SETUP): Catch unexpanded macros with
        beginning with LT_ and _LT_.
        * configure.ac (LT_MAJOR, LT_MINOR, LT_MICRO, LT_ALPHA): Renamed

diff --git a/Makefile.am b/Makefile.am
index 30fbd78248215b81dbe380eb19d980b4e9940a3b..880e5de5009e726bc685bb75d0d7c6bf1080eb34 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,19 +41,9 @@ pkgmacro_DATA = m4/libtool.m4 m4/ltdl.m4 m4/ltsugar.m4
 # The standalone libtool script, and the libtool distributor.
 bin_SCRIPTS = libtool libtoolize
 
-config_status = $(top_builddir)/config.status
-
-libtool: config/ltmain.sh $(top_builddir)/config.status
-       CONFIG_FILES= CONFIG_HEADERS= CONFIG_COMMANDS=$@ $(SHELL) $(config_status)
-       chmod +x $@
-
-libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
-       CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_COMMANDS= $(SHELL) $(config_status)
-       chmod +x $@
-
 # Make sure config.status is regenerated when the version timestamp changes
 MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp
-$(config_status): stamp-vcl
+$(top_builddir)/config_status: stamp-vcl
 stamp-vcl: vcl.tmp $(top_srcdir)/ChangeLog
 vcl.tmp:
        @dir=.; test -f $$dir/stamp-vcl || dir=$(srcdir); \
@@ -234,7 +224,7 @@ delta-diff: prev-tarball new-tarball
 ## Unpack the tarballs somewhere to diff them
        rm -rf delta-diff
        mkdir delta-diff
-       
+
        ofile="../$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
        cd delta-diff \
        && tar xzf "../$(PACKAGE)-$(LASTRELEASE).tar.gz" \
@@ -248,7 +238,7 @@ delta-diff: prev-tarball new-tarball
        && rm -f $$ofile.directive
 
        rm -rf delta-diff
-       
+
 XDELTA = xdelta
 XDELTA_OPTIONS = --pristine -9
 
@@ -266,4 +256,3 @@ delta-xdelta: prev-tarball new-tarball got-xdelta
        && echo "directory: libtool" > $$ofile.directive \
        && $(GPG) --clearsign $$ofile.directive \
        && rm -f $$ofile.directive
-

diff --git a/configure.ac b/configure.ac
index d318c29faa66ac0b1dd07dd03a9983fbcdad6066..3d5a466168b1a113e707a4356c02c8bbad3ebbd1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,7 @@ AM_CONDITIONAL(HAVE_RC, [test "x$RC" != xno])
 ## Libtool initialisation. ##
 ## ----------------------- ##
 AC_CONFIG_FILES([config/ltmain.sh:./ltmain.in])
+AC_CONFIG_FILES([libtoolize], [chmod a+x libtoolize])
 AC_LIBTOOL_DLOPEN
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL