diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/Makefile.am | 5 | ||||
| -rw-r--r-- | ld/Makefile.in | 31 | ||||
| -rw-r--r-- | ld/aclocal.m4 | 4 | ||||
| -rw-r--r-- | ld/ld.texinfo | 2 |
5 files changed, 30 insertions, 20 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 6d76315..c323a92 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2006-05-02 Daniel Jacobowitz <dan@codesourcery.com> + + * Makefile.am (AM_MAKEINFOFLAGS): Add libiberty. + (TEXI2POD): Use AM_MAKEINFOFLAGS. + (configdoc.texi): Don't set top_srcdir. + * ld.texinfo: Don't use top_srcdir. + * aclocal.m4, Makefile.in: Regenerated. + 2006-04-19 Alan Modra <amodra@bigpond.net.au> * ldlang.c (wild): Tidy default_common_section loop. diff --git a/ld/Makefile.am b/ld/Makefile.am index 3c4fa5e..61581ac 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -46,7 +46,7 @@ DOCVER = gen # Options to extract the man page from ld.texinfo MANCONF = -Dman -TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl +TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS) POD2MAN = pod2man --center="GNU Development Tools" \ --release="binutils-$(VERSION)" --section=1 @@ -97,7 +97,7 @@ info_TEXINFOS = ld.texinfo noinst_TEXINFOS = ldint.texinfo man_MANS = ld.1 -AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc +AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty TEXI2DVI = texi2dvi -I $(srcdir) -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\"" @@ -1702,7 +1702,6 @@ bootstrap: ld3$(EXEEXT) configdoc.texi: ${DOCVER}-doc.texi cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi chmod u+w ./configdoc.texi - echo "@set top_srcdir $(top_srcdir)" >> ./configdoc.texi ldver.texi: $(srcdir)/../bfd/configure rm -f $@ diff --git a/ld/Makefile.in b/ld/Makefile.in index 30b9255..8c9029f 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(ld_new_SOURCES) $(EXTRA_ld_new_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -282,7 +280,7 @@ DOCVER = gen # Options to extract the man page from ld.texinfo MANCONF = -Dman -TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl +TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS) POD2MAN = pod2man --center="GNU Development Tools" \ --release="binutils-$(VERSION)" --section=1 @@ -326,7 +324,7 @@ CXX_FOR_TARGET = ` \ info_TEXINFOS = ld.texinfo noinst_TEXINFOS = ldint.texinfo man_MANS = ld.1 -AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc +AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty TEXI2DVI = texi2dvi -I $(srcdir) -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 @@ -801,9 +799,11 @@ distclean-libtool: restore=: && backupdir="$(am__leading_dot)am$$$$" && \ am__cwd=`pwd` && cd $(srcdir) && \ rm -rf $$backupdir && mkdir $$backupdir && \ - for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ - if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ - done; \ + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ + for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ + done; \ + else :; fi && \ cd "$$am__cwd"; \ if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $@ $<; \ @@ -813,7 +813,7 @@ distclean-libtool: else \ rc=$$?; \ cd $(srcdir) && \ - $$restore $$backupdir/* `echo "$@" | sed 's|[^/]*$$||'`; \ + $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ fi; \ rm -rf $$backupdir; exit $$rc @@ -845,6 +845,7 @@ ld.dvi: ld.texinfo ld.pdf: ld.texinfo ld.html: ld.texinfo .dvi.ps: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ $(DVIPS) -o $@ $< uninstall-info-am: @@ -877,10 +878,13 @@ dist-info: $(INFO_DEPS) $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ if test -f $$base; then d=.; else d=$(srcdir); fi; \ - for file in $$d/$$base*; do \ - relfile=`expr "$$file" : "$$d/\(.*\)"`; \ - test -f $(distdir)/$$relfile || \ - cp -p $$file $(distdir)/$$relfile; \ + base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ + for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ + if test -f $$file; then \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ + else :; fi; \ done; \ done @@ -2501,7 +2505,6 @@ bootstrap: ld3$(EXEEXT) configdoc.texi: ${DOCVER}-doc.texi cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi chmod u+w ./configdoc.texi - echo "@set top_srcdir $(top_srcdir)" >> ./configdoc.texi ldver.texi: $(srcdir)/../bfd/configure rm -f $@ diff --git a/ld/aclocal.m4 b/ld/aclocal.m4 index ca84997..cd42673 100644 --- a/ld/aclocal.m4 +++ b/ld/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- diff --git a/ld/ld.texinfo b/ld/ld.texinfo index 339b32d..4bf5a2c 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -342,7 +342,7 @@ Here is a table of the generic command line switches accepted by the GNU linker: @table @gcctabopt -@include @value{top_srcdir}/../libiberty/at-file.texi +@include at-file.texi @kindex -a@var{keyword} @item -a@var{keyword} |