[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: libtool--devo--1.0--patch-112
From: |
Gary V. Vaughan |
Subject: |
FYI: libtool--devo--1.0--patch-112 |
Date: |
Thu, 5 Aug 2004 08:55:23 +0100 (BST) |
User-agent: |
mailnotify/0.3 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
- --
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)
iD8DBQFBEefrFRMICSmD1gYRAmnvAJ9RLAZIh2lLT0IqE6SCJAUUHun6NwCeIyTN
Ni7cXNV93So/SU4YShFigxc=
=zlp3
-----END PGP SIGNATURE-----
* looking for address@hidden/libtool--devo--1.0--patch-111 to compare with
* comparing to address@hidden/libtool--devo--1.0--patch-111
M ChangeLog
M Makefile.am
* modified files
Index: Changelog
from Gary V. Vaughan <address@hidden>
* 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.
* m4/libtool.m4 (LT_AC_PROG_SED): Set SED when running from cache as
--- orig/Makefile.am
+++ mod/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 @@
-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 @@
## 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 @@
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 @@
# 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: libtool--devo--1.0--patch-112,
Gary V. Vaughan <=