mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-18 14:16:00 +08:00
* Makefile.am ($(top_srcdir)/config/ltmain.sh): Depends on
Makefile. (timestamp): Factor out timestamp setting and edit it based on the version number, so that it is empty for release versions. ($(top_srcdir)/config/ltmain.sh): Use it. (libtoolize): Ditto.
This commit is contained in:
parent
5de3e29e35
commit
199c90ecca
@ -1,5 +1,12 @@
|
||||
2004-08-05 Gary V. Vaughan <gary@gnu.org>
|
||||
|
||||
* Makefile.am ($(top_srcdir)/config/ltmain.sh): Depends on
|
||||
Makefile.
|
||||
(timestamp): Factor out timestamp setting and edit it based on the
|
||||
version number, so that it is empty for release versions.
|
||||
($(top_srcdir)/config/ltmain.sh): Use it.
|
||||
(libtoolize): Ditto.
|
||||
|
||||
* Makefile.am (libtool): Depends on ltmain.sh.
|
||||
(libtoolize): Set and substitute TIMESTAMP.
|
||||
|
||||
@ -33,7 +40,7 @@
|
||||
|
||||
2004-08-01 Maciej W. Rozycki <macro@linux-mips.org>
|
||||
|
||||
* m4/libtool.m4 (LT_AC_PROG_SED): Set SED when running from cache as
|
||||
* m4/libtool.m4 (LT_AC_PROG_SED): Set SED when running from cache as
|
||||
well.
|
||||
|
||||
2004-07-31 Gary V. Vaughan <gary@gnu.org>
|
||||
|
20
Makefile.am
20
Makefile.am
@ -19,7 +19,7 @@
|
||||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
edit = sed \
|
||||
edit = sed \
|
||||
-e 's,@PACKAGE\@,$(PACKAGE),g' \
|
||||
-e 's,@VERSION\@,$(VERSION),g' \
|
||||
-e 's,@MACRO_VERSION\@,$(VERSION),g' \
|
||||
@ -31,6 +31,12 @@ edit = sed \
|
||||
-e 's,@aclocaldir\@,$(aclocaldir),g' \
|
||||
-e "s,@configure_input\@,Generated from $$input; do not edit by hand,g"
|
||||
|
||||
timestamp = set -- `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
|
||||
case $(VERSION) in \
|
||||
*[acegikmoqsuwy]) TIMESTAMP=" $$1 $$2 $$3" ;; \
|
||||
*) TIMESTAMP="" ;; \
|
||||
esac
|
||||
|
||||
BUILD_SUBDIRS = . libltdl doc tests
|
||||
SUBDIRS = $(BUILD_SUBDIRS)
|
||||
DIST_SUBDIRS = $(BUILD_SUBDIRS)
|
||||
@ -89,12 +95,12 @@ $(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac stamp-vcl
|
||||
|
||||
## And for similar reasons, ltmain.sh can't be built from config.status.
|
||||
EXTRA_DIST += config/ltmain.sh
|
||||
$(top_srcdir)/config/ltmain.sh: config/ltmain.in configure.ac stamp-vcl
|
||||
set -- `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
|
||||
$(top_srcdir)/config/ltmain.sh: config/ltmain.in configure.ac stamp-vcl Makefile
|
||||
$(timestamp); \
|
||||
cd $(top_srcdir); \
|
||||
rm -f config/ltmain.tmp; \
|
||||
input="ltmain.in"; \
|
||||
$(edit) -e "s,@TIMESTAMP\@,$$1 $$2 $$3,g" \
|
||||
$(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
|
||||
-e "s,@package_revision\@,$$1,g" \
|
||||
config/ltmain.in > config/ltmain.tmp; \
|
||||
chmod a-w config/ltmain.tmp; \
|
||||
@ -105,9 +111,9 @@ bin_SCRIPTS = libtoolize libtool
|
||||
|
||||
libtoolize: libtoolize.in Makefile
|
||||
rm -f libtoolize.tmp libtoolize
|
||||
set -- `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
|
||||
$(timestamp); \
|
||||
input="libtoolize.in"; \
|
||||
$(edit) -e "s,@TIMESTAMP\@,$$1 $$2 $$3,g" \
|
||||
$(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
|
||||
$(srcdir)/libtoolize.in > libtoolize.tmp
|
||||
chmod a+x libtoolize.tmp
|
||||
chmod a-w libtoolize.tmp
|
||||
@ -115,7 +121,7 @@ libtoolize: libtoolize.in Makefile
|
||||
|
||||
# Automake doesn't want us to generate distributed files from config.status,
|
||||
# but the alternative (see libtool-1.4.3) was even uglier!
|
||||
libtool: $(top_builddir)/config.status $(top_srcdir)/config/ltmain.sh
|
||||
libtool: $(top_builddir)/config.status config/ltmain.sh
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||
|
||||
.PHONY: configure-subdirs
|
||||
|
Loading…
Reference in New Issue
Block a user