From c46ba4ec280028e358d1f399e74d85a8be69283e Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Mon, 4 Oct 2004 08:59:34 +0000 Subject: [PATCH] Without this change, the distributed libtool tarball has a dependency on autom4te. There was some inconsistency in the filenames: now we have foo.m4sh -> m4sh -> foo.in -> configure -> foo[.sh]. Bootstrap runs the m4sh steps and the resulting .in files are distributed. * tests/Makefile.am (EXTRA_DIST): Distribute defs.m4sh. * Makefile.am (EXTRA_DIST): Distribute libtoolize.m4sh. (libtoolize.in, libtoolize): Split into bootstrap and runtime stages. ($(top_srcdir)/tests/defs.in, $(top_srcdir)/tests/defs): Ditto. ($(top_srcdir)/config/ltmain.sh): Swap ltmain.m4sh and ltmain.in names. * bootstrap: Make libtoolize.in and tests/defs.in. * NEWS: Updated. --- ChangeLog | 18 ++++++++++++ Makefile.am | 49 ++++++++++++++++++------------- NEWS | 4 ++- bootstrap | 2 +- config/{ltmain.in => ltmain.m4sh} | 0 libtoolize.in => libtoolize.m4sh | 0 tests/Makefile.am | 2 +- tests/{defs.in => defs.m4sh} | 0 8 files changed, 52 insertions(+), 23 deletions(-) rename config/{ltmain.in => ltmain.m4sh} (100%) rename libtoolize.in => libtoolize.m4sh (100%) rename tests/{defs.in => defs.m4sh} (100%) diff --git a/ChangeLog b/ChangeLog index 7a60746a7..5def95a2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2004-10-04 Gary V. Vaughan + + Without this change, the distributed libtool tarball has a + dependency on autom4te. There was some inconsistency in the + filenames: now we have foo.m4sh -> m4sh -> foo.in -> configure + -> foo[.sh]. Bootstrap runs the m4sh steps and the resulting .in + files are distributed. + + * tests/Makefile.am (EXTRA_DIST): Distribute defs.m4sh. + * Makefile.am (EXTRA_DIST): Distribute libtoolize.m4sh. + (libtoolize.in, libtoolize): Split into bootstrap and runtime + stages. + ($(top_srcdir)/tests/defs.in, $(top_srcdir)/tests/defs): Ditto. + ($(top_srcdir)/config/ltmain.sh): Swap ltmain.m4sh and ltmain.in + names. + * bootstrap: Make libtoolize.in and tests/defs.in. + * NEWS: Updated. + 2004-10-03 Bob Friesenhahn * README, README.alpha: Update notes regarding available VERBOSE diff --git a/Makefile.am b/Makefile.am index 2cceb2e7b..96b0d55c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,7 @@ SUBDIRS = $(BUILD_SUBDIRS) DIST_SUBDIRS = $(BUILD_SUBDIRS) sh_files = config/general.m4sh config/getopt.m4sh -EXTRA_DIST = bootstrap libtoolize.in config/ltmain.in config/mkstamp \ +EXTRA_DIST = bootstrap libtoolize.in config/ltmain.m4sh config/mkstamp \ $(sh_files) stamp-vcl ChangeLog.1996 ChangeLog.1997 ChangeLog.1998 \ ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 ChangeLog.2002 \ ChangeLog.2003 @@ -115,47 +115,56 @@ $(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac stamp-vcl ## distcheck (at least) by rebuilding ltmain.sh in the source ## tree whenever config.status regenerates the Makefile. EXTRA_DIST += config/ltmain.sh -$(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.in configure.ac stamp-vcl +$(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac stamp-vcl $(timestamp); \ cd $(top_srcdir); \ - rm -f config/ltmain.m4sh config/ltmain.tmp config/ltmain.sh; \ - $(M4SH) -B ./config config/ltmain.in > config/ltmain.m4sh; \ + rm -f config/ltmain.in config/ltmain.tmp config/ltmain.sh; \ + $(M4SH) -B ./config config/ltmain.m4sh > config/ltmain.in; \ input="ltmain.in"; \ $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \ -e "s,@package_revision\@,$$1,g" \ - config/ltmain.m4sh > config/ltmain.tmp; \ - rm -f config/ltmain.m4sh; \ + config/ltmain.in > config/ltmain.tmp; \ + rm -f config/ltmain.in; \ chmod a-w config/ltmain.tmp; \ mv -f config/ltmain.tmp config/ltmain.sh # The libtool distributor and the standalone libtool script. bin_SCRIPTS = libtoolize libtool -libtoolize: $(sh_files) libtoolize.in Makefile - rm -f libtoolize.m4sh libtoolize.tmp libtoolize - $(M4SH) -B $(top_srcdir)/config \ - $(srcdir)/libtoolize.in > libtoolize.m4sh +libtoolize: libtoolize.in + rm -f libtoolize.tmp libtoolize $(timestamp); \ - input="libtoolize.in"; \ + input="libtoolize.m4sh"; \ $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \ - libtoolize.m4sh > libtoolize.tmp - rm -f libtoolize.m4sh + $(top_srcdir)/libtoolize.in > libtoolize.tmp chmod a+x libtoolize.tmp chmod a-w libtoolize.tmp mv -f libtoolize.tmp libtoolize +# Use `$(top_srcdir)' for the benefit of non-GNU makes: this is +# how libtoolize.in appears in our dependencies. +EXTRA_DIST += libtoolize.m4sh +$(top_srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am + cd $(top_srcdir); \ + rm -f libtoolize.in; \ + $(M4SH) -B ./config libtoolize.m4sh > libtoolize.in + # The defs script shouldn't be recreated whenever the Makefile is # regenerated since the source tree can be read-only. check-recursive: tests/defs -tests/defs: tests/defs.in Makefile.am - rm -f tests/defs.m4sh tests/defs.tmp tests/defs; \ - $(M4SH) -B $(top_srcdir)/config \ - $(top_srcdir)/tests/defs.in > tests/defs.m4sh; \ - input="defs.in"; \ - $(edit) tests/defs.m4sh > tests/defs.tmp; \ - rm -f tests/defs.m4sh; \ +tests/defs: tests/defs.in + rm -f tests/defs.tmp tests/defs; \ + input="defs.m4sh"; \ + $(edit) $(top_srcdir)/tests/defs.in > tests/defs.tmp; \ mv -f tests/defs.tmp tests/defs +# Use `$(top_srcdir)/tests' for the benefit of non-GNU makes: this is +# how defs.in appears in our dependencies. +# No need to EXTRA_DIST defs.m4sh here, that is handled in tests/Makefile.am. +$(top_srcdir)/tests/defs.in: tests/defs.m4sh Makefile.am + cd $(top_srcdir); \ + rm -f tests/defs.in; \ + $(M4SH) -B ./config tests/defs.m4sh > tests/defs.in # Automake doesn't want us to generate distributed files from config.status, # but the alternative (see libtool-1.4.3) was even uglier! diff --git a/NEWS b/NEWS index 071587456..7b27fd040 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,9 @@ NEWS - list of user-visible changes between releases of GNU Libtool New in 1.9f: 2004-??-??; CVS version 1.9e, Libtool team: -* ?? +* Fix a regression in 1.9d, which required an installed automake to build the + bootstrapped tarball. +* Fix hanging bug on MinGW. New in 1.9d: 2004-10-03; CVS version 1.9c, Libtool team: * If non-pic objects were not compiled, and libtool is called in link mode, diff --git a/bootstrap b/bootstrap index 0fa423fa4..21f70b30f 100755 --- a/bootstrap +++ b/bootstrap @@ -58,7 +58,7 @@ set -- `sed '/AC_INIT/{s/[][,()]/ /g; p;};d' configure.ac` # configure, and ltversion.m4 to generate configure in the first place: rm -f ./config/ltmain.sh ./m4/ltversion.m4 test -f Makefile || { makefile=Makefile; cp Makefile.am $makefile; } -make ./config/ltmain.sh ./m4/ltversion.m4 \ +make ./config/ltmain.sh ./m4/ltversion.m4 ./libtoolize.in ./tests/defs.in \ top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="autom4te -l m4sh" test -z "$makefile" || rm -f "$makefile" diff --git a/config/ltmain.in b/config/ltmain.m4sh similarity index 100% rename from config/ltmain.in rename to config/ltmain.m4sh diff --git a/libtoolize.in b/libtoolize.m4sh similarity index 100% rename from libtoolize.in rename to libtoolize.m4sh diff --git a/tests/Makefile.am b/tests/Makefile.am index 81540deae..dbf637871 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -90,7 +90,7 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" F77="$(F77)" \ FFLAGS="$(FFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CPP="$(CPP)" -EXTRA_DIST = defs.in $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS) +EXTRA_DIST = defs.in defs.m4sh $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS) DIST_SUBDIRS = $(CONF_SUBDIRS) # FIXME: Automake-1.7b (at least) only honours DIST_SUBDIRS if SUBDIRS is diff --git a/tests/defs.in b/tests/defs.m4sh similarity index 100% rename from tests/defs.in rename to tests/defs.m4sh -- 2.47.2