4
0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-28 03:27:46 +08:00

* Makefile.in: Revert 2001-06-17.

(VER): If AM_INIT_AUTOMAKE uses BFD_VERSION, get version from bfd/.
This commit is contained in:
Alan Modra 2001-06-19 09:17:39 +00:00
parent f92f7f6a12
commit c3e68fb89e
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2001-06-19 Alan Modra <amodra@bigpond.net.au>
* Makefile.in: Revert 2001-06-17.
(VER): If AM_INIT_AUTOMAKE uses BFD_VERSION, get version from bfd/.
2001-06-17 H.J. Lu <hjl@gnu.org> 2001-06-17 H.J. Lu <hjl@gnu.org>
* Makefile.in (gas.tar.bz2): Pass TOOL=bfd PACKAGE=gas to make. * Makefile.in (gas.tar.bz2): Pass TOOL=bfd PACKAGE=gas to make.

View File

@ -1739,7 +1739,9 @@ SUPPORT_FILES = list-of-support-files-for-tool-in-question
# NOTE: No double quotes in the below. It is used within shell script # NOTE: No double quotes in the below. It is used within shell script
# as VER="$(VER)" # as VER="$(VER)"
VER = ` if grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \ VER = ` if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \
sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \ sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
else \ else \
sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \ sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
@ -1868,7 +1870,7 @@ DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
.PHONY: gas.tar.bz2 .PHONY: gas.tar.bz2
GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep
gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
$(MAKE) -f Makefile.in taz TOOL=bfd PACKAGE=gas \ $(MAKE) -f Makefile.in taz TOOL=gas \
MD5PROG="$(MD5PROG)" \ MD5PROG="$(MD5PROG)" \
SUPPORT_FILES="$(GAS_SUPPORT_DIRS)" SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"
@ -1876,14 +1878,14 @@ gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
.PHONY: binutils.tar.bz2 .PHONY: binutils.tar.bz2
BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms mkdep BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms mkdep
binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
$(MAKE) -f Makefile.in taz TOOL=bfd PACKAGE=binutils \ $(MAKE) -f Makefile.in taz TOOL=binutils \
MD5PROG="$(MD5PROG)" \ MD5PROG="$(MD5PROG)" \
SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)" SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)"
.PHONY: gas+binutils.tar.bz2 .PHONY: gas+binutils.tar.bz2
GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof
gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
$(MAKE) -f Makefile.in taz TOOL=bfd PACKAGE=gas \ $(MAKE) -f Makefile.in taz TOOL=gas \
MD5PROG="$(MD5PROG)" \ MD5PROG="$(MD5PROG)" \
SUPPORT_FILES="$(GASB_SUPPORT_DIRS)" SUPPORT_FILES="$(GASB_SUPPORT_DIRS)"