diff options
| author | Daniel Jacobowitz <drow@false.org> | 2005-05-15 18:19:45 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2005-05-15 18:19:45 +0000 |
| commit | 42ecbf5edab08ee88b37d9fbd8542f5f25ce51ae (patch) | |
| tree | d891db7c28e1e63b0cf7d0eeeea50e3ceff3fc35 /ld/Makefile.am | |
| parent | f13c9beaa34b7839c90968e684ad455131f47d32 (diff) | |
| download | gdb-42ecbf5edab08ee88b37d9fbd8542f5f25ce51ae.zip gdb-42ecbf5edab08ee88b37d9fbd8542f5f25ce51ae.tar.gz gdb-42ecbf5edab08ee88b37d9fbd8542f5f25ce51ae.tar.bz2 | |
./
* ylwrap: Import from Automake 1.9.5.
binutils/
* acinclude.m4: Remove obsolete code.
* configure.in: Update AC_PREREQ.
* doc/Makefile.am (binutils_TEXINFOS): Define.
(config.texi): Depend on distributed files instead of built
files.
(binutils.dvi, binutils.info): Remove unnecessary rules.
(DISTCLEANFILES): Remove.
(install-data-local): Renamed from install.
(info-local): Renamed from info.
* Makefile.in, aclocal.m4, config.in, configure,
doc/Makefile.in: Regenerated.
gas/
* Makefile.am (m68k-parse.c, itbl-parse.c): Update ylwrap
invocation.
* Makefile.in: Regenerated.
ld/
* Makefile.am (AM_MAKEINFOFLAGS): Define.
(TEXI2DVI): Define.
(ldver.texi): Depend on distributed files instead of built files.
(ld.info): Include $(srcdir) in the rule target. Remove actions.
(ld.dvi): Remove actions.
(MAINTAINERCLEANFILES): Add configdoc.texi.
(CONFIG_STATUS_DEPENDENCIES): Add bfd/configure.in.
(install-data-local): Renamed from install.
(Makefile): Remove explicit dependency.
* acinclude.m4: Remove obsolete code.
* configure.in: Update AC_PREREQ. Remove extra $CONFIG_SHELL.
* Makefile.in, aclocal.m4, config.in, configure: Regenerated.
gdb/
* Makefile.in (.y.c): Update ylwrap invocation.
Diffstat (limited to 'ld/Makefile.am')
| -rw-r--r-- | ld/Makefile.am | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/ld/Makefile.am b/ld/Makefile.am index 1bb6055..0e5f3bf 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -103,6 +103,9 @@ info_TEXINFOS = ld.texinfo noinst_TEXINFOS = ldint.texinfo man_MANS = ld.1 +AM_MAKEINFOFLAGS = -I $(BFDDIR)/doc +TEXI2DVI = texi2dvi -I $(BFDDIR)/doc + INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\"" BFDLIB = ../bfd/libbfd.la @@ -1630,17 +1633,12 @@ configdoc.texi: ${DOCVER}-doc.texi || ln ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \ || cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi -ldver.texi: Makefile +ldver.texi: $(srcdir)/../bfd/configure rm -f $@ - echo '@set VERSION $(VERSION)' > $@ - -ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi - @rm -f $@ $@-[0-9] $@-[0-9][0-9] - $(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc $(srcdir)/ld.texinfo + eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@ +$(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi - TEXINPUTS=$(top_srcdir)/../texinfo:$$TEXINPUTS \ - MAKEINFO="$(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc" $(TEXI2DVI) -I $(BFDDIR)/doc $(srcdir)/ld.texinfo # Build the man page from the texinfo file # The sed command removes the no-adjust Nroff command so that @@ -1654,10 +1652,12 @@ ld.1: $(srcdir)/ld.texinfo configdoc.texi ldver.texi (rm -f $@.T$$$$ && exit 1) rm -f ld.pod -MAINTAINERCLEANFILES = ldver.texi +MAINTAINERCLEANFILES = ldver.texi configdoc.texi -# We want to reconfigure if configure.host or configure.tgt changes. -CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt +# We want to reconfigure if configure.host or configure.tgt changes. We +# extract version from bfd/configure.in, so we must depend on that also. +CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt \ + $(srcdir)/../bfd/configure.in MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ ldemul-list.h crtbegin.o crtend.o ld.log ld.sum @@ -1690,7 +1690,7 @@ install-data-local: # We want install to imply install-info as per GNU standards, despite the # cygnus option. -install: install-info +install-data-local: install-info # Stuff that should be included in a distribution. The diststuff # target is run by the taz target in ../Makefile.in. @@ -1701,8 +1701,6 @@ DISTCLEANFILES = tdirs site.exp site.bak stringify.sed distclean-local: rm -rf ldscripts -Makefile: $(BFDDIR)/configure.in - # Targets to rebuild dependencies in this Makefile. # Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES). DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h |