diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/Makefile.am | 15 | ||||
| -rw-r--r-- | ld/Makefile.in | 15 |
3 files changed, 24 insertions, 16 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index d65b418..5a1be80 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +Mon Apr 6 15:33:39 1998 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.am (ld.info): Invoke makeinfo with -I options directly + rather than relying on default rule. Don't depend upon + bfdsumm.texi. + (ld.dvi): Likewise. + (bfdsumm.texi): Remove target. + (CLEANFILES): Take bfdsumm.texi out of value. + * Makefile.in: Rebuild. + Sun Apr 5 13:07:57 1998 Ian Lance Taylor <ian@cygnus.com> * scripttempl/pe.sc: Use shell variables to avoid depending upon diff --git a/ld/Makefile.am b/ld/Makefile.am index a6c5706..5466bc8 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -662,14 +662,13 @@ configdoc.texi: ${DOCVER}-doc.texi || ln ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \ || cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi -ld.info: $(srcdir)/ld.texinfo configdoc.texi bfdsumm.texi -ld.dvi: $(srcdir)/ld.texinfo configdoc.texi bfdsumm.texi +ld.info: $(srcdir)/ld.texinfo configdoc.texi + @rm -f $@ $@-[0-9] $@-[0-9][0-9] + $(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc $(srcdir)/ld.texinfo -# We want to include a file from the BFD documentation. automake -# doesn't give us a way to set the include directories for makeinfo, -# so we just create a file locally to include it. -bfdsumm.texi: Makefile - echo @include $(BFDDIR)/doc/bfdsumm.texi > bfdsumm.texi +ld.dvi: $(srcdir)/ld.texinfo configdoc.texi + TEXINPUTS=$(top_srcdir)/../texinfo:$$TEXINPUTS \ + MAKEINFO='$(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc' $(TEXI2DVI) $(srcdir)/ld.texinfo # We want to reconfigure if configure.host or configure.tgt changes. Makefile: configure.host configure.tgt @@ -678,7 +677,7 @@ MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ ldemul-list.h crtbegin.o crtend.o ld.log ld.sum mostlyclean-local: -rm -rf tmpdir -CLEANFILES = dep.sed .dep .dep1 bfdsumm.texi +CLEANFILES = dep.sed .dep .dep1 .PHONY: install-exec-local install-data-local diff --git a/ld/Makefile.in b/ld/Makefile.in index afaed14..4dd928a 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -306,7 +306,7 @@ TESTBFDLIB = ../bfd/.libs/libbfd.a MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ ldemul-list.h crtbegin.o crtend.o ld.log ld.sum -CLEANFILES = dep.sed .dep .dep1 bfdsumm.texi +CLEANFILES = dep.sed .dep .dep1 # Stuff that should be included in a distribution. The diststuff # target is run by the taz target in ../Makefile.in. @@ -1163,14 +1163,13 @@ configdoc.texi: ${DOCVER}-doc.texi || ln ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \ || cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi -ld.info: $(srcdir)/ld.texinfo configdoc.texi bfdsumm.texi -ld.dvi: $(srcdir)/ld.texinfo configdoc.texi bfdsumm.texi +ld.info: $(srcdir)/ld.texinfo configdoc.texi + @rm -f $@ $@-[0-9] $@-[0-9][0-9] + $(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc $(srcdir)/ld.texinfo -# We want to include a file from the BFD documentation. automake -# doesn't give us a way to set the include directories for makeinfo, -# so we just create a file locally to include it. -bfdsumm.texi: Makefile - echo @include $(BFDDIR)/doc/bfdsumm.texi > bfdsumm.texi +ld.dvi: $(srcdir)/ld.texinfo configdoc.texi + TEXINPUTS=$(top_srcdir)/../texinfo:$$TEXINPUTS \ + MAKEINFO='$(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc' $(TEXI2DVI) $(srcdir)/ld.texinfo # We want to reconfigure if configure.host or configure.tgt changes. Makefile: configure.host configure.tgt |