From 8bdd28dcf584638b1450fb2dd743e7ad8cba5272 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Fri, 6 Feb 2004 16:11:26 +0000 Subject: [PATCH] * Makefile.am ($(top_builddir)/config.status): Removed. * configure.ac (CONFIG_STATUS_DEPENDENCIES): This substitution is how automake-1.8 now informs all Makefiles when config.status needs to be rebuilt. Reported by Alexandre Duret-Lutz --- ChangeLog | 6 ++++++ Makefile.am | 2 -- configure.ac | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83e05da5..6e27c26a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-02-06 Gary V. Vaughan + * Makefile.am ($(top_builddir)/config.status): Removed. + * configure.ac (CONFIG_STATUS_DEPENDENCIES): This substitution is + how automake-1.8 now informs all Makefiles when config.status + needs to be rebuilt. + Reported by Alexandre Duret-Lutz + * 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/Makefile.am b/Makefile.am index 880e5de5..41d9127f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,9 +41,7 @@ pkgmacro_DATA = m4/libtool.m4 m4/ltdl.m4 m4/ltsugar.m4 # The standalone libtool script, and the libtool distributor. bin_SCRIPTS = libtool libtoolize -# Make sure config.status is regenerated when the version timestamp changes MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp -$(top_builddir)/config_status: stamp-vcl stamp-vcl: vcl.tmp $(top_srcdir)/ChangeLog vcl.tmp: @dir=.; test -f $$dir/stamp-vcl || dir=$(srcdir); \ diff --git a/configure.ac b/configure.ac index 3d5a4661..b295dc94 100644 --- a/configure.ac +++ b/configure.ac @@ -112,6 +112,8 @@ dnl These are bootstrap requirements, once built, libtool may work with dnl much older releases of autoconf and automake. See release notes. AM_INIT_AUTOMAKE([1.8 gnits dist-bzip2]) ## We use auto-m4_including +dnl Make sure config.status is regenerated when the version timestamp changes +AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_builddir)/stamp-vcl']) ## ------------------------------- ## ## Libtool specific configuration. ##