diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/Makefile.am | 17 | ||||
| -rw-r--r-- | ld/Makefile.in | 20 | ||||
| -rw-r--r-- | ld/ld.texinfo | 7 |
4 files changed, 34 insertions, 18 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 867bce7..04528eb 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +Tue Jul 7 18:03:22 1998 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.am (ldver.texi): New target. + (ld.info, ld.dvi): Depend upon ldver.texi. + * ld.texinfo: Include ldver.texi. Mention version number on title + page and in top node. + * Makefile.in: Rebuild. + Mon Jul 6 14:55:13 1998 Ian Lance Taylor <ian@cygnus.com> * configure.tgt (i[3456]86-*-solaris*): New target. diff --git a/ld/Makefile.am b/ld/Makefile.am index 888eccf..f6eb832 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -678,16 +678,21 @@ 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 +ldver.texi: Makefile + 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 -ld.dvi: $(srcdir)/ld.texinfo configdoc.texi +ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.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 +config.status: $(srcdir)/configure $(srcdir)/configure.host $(srcdir)/configure.tgt + $(SHELL) ./config.status --recheck MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ ldemul-list.h crtbegin.o crtend.o ld.log ld.sum @@ -701,8 +706,8 @@ install-exec-local: ld-new$(EXEEXT) $(mkinstalldirs) $(bindir) $(tooldir)/bin @list='$(noinst_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/-new//'|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/-new//'|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done rm -f $(tooldir)/bin/ld$(EXEEXT) @@ -713,7 +718,7 @@ install-exec-local: ld-new$(EXEEXT) fi install-data-local: - $(mkinstalldirs) $(scriptdir) + $(mkinstalldirs) $(scriptdir)/ldscripts for f in ldscripts/*; do \ $(INSTALL_DATA) $$f $(scriptdir)/$$f ; \ done diff --git a/ld/Makefile.in b/ld/Makefile.in index 564dfe0..a7633ff 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -379,9 +379,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(ACLOCAL_M4): @MAINT@ configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) - -config.status: $(srcdir)/configure - $(SHELL) ./config.status --recheck $(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) @@ -1288,16 +1285,21 @@ 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 +ldver.texi: Makefile + 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 -ld.dvi: $(srcdir)/ld.texinfo configdoc.texi +ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.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 +config.status: $(srcdir)/configure $(srcdir)/configure.host $(srcdir)/configure.tgt + $(SHELL) ./config.status --recheck mostlyclean-local: -rm -rf tmpdir @@ -1307,8 +1309,8 @@ install-exec-local: ld-new$(EXEEXT) $(mkinstalldirs) $(bindir) $(tooldir)/bin @list='$(noinst_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/-new//'|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/-new//'|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done rm -f $(tooldir)/bin/ld$(EXEEXT) @@ -1319,7 +1321,7 @@ install-exec-local: ld-new$(EXEEXT) fi install-data-local: - $(mkinstalldirs) $(scriptdir) + $(mkinstalldirs) $(scriptdir)/ldscripts for f in ldscripts/*; do \ $(INSTALL_DATA) $$f $(scriptdir)/$$f ; \ done diff --git a/ld/ld.texinfo b/ld/ld.texinfo index e4731c7..75335b4 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -3,6 +3,7 @@ @syncodeindex ky cp @include configdoc.texi @c (configdoc.texi is generated by the Makefile) +@include ldver.texi @c @smallbook @@ -15,7 +16,7 @@ END-INFO-DIR-ENTRY @end ifinfo @ifinfo -This file documents the @sc{gnu} linker LD. +This file documents the @sc{gnu} linker LD version @value{VERSION}. Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. @@ -48,7 +49,7 @@ notice identical to this one except for the removal of this paragraph @subtitle The GNU linker @sp 1 @subtitle @code{ld} version 2 -@subtitle April 1998 +@subtitle Version @value{VERSION} @author Steve Chamberlain @author Ian Lance Taylor @author Cygnus Solutions @@ -85,7 +86,7 @@ into another language, under the above conditions for modified versions. @ifinfo @node Top @top Using ld -This file documents the @sc{gnu} linker ld. +This file documents the @sc{gnu} linker ld version @value{VERSION}. @menu * Overview:: Overview |