From e10fad1212735b3747d571822d5fc33be5af6609 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 2 Jun 2006 23:08:12 +0000 Subject: [PATCH] binutils: * doc/Makefile.am (TEXI2DVI): Define. * doc/Makefile.in: Regenerate. gas: * doc/Makefile.am (TEXI2DVI): Define. * doc/Makefile.in: Regenerate. * doc/c-arc.texi: Fix typo. ld: * Makefile.am (TEXI2DVI): Add -I $(top_srcdir)/../libiberty. * Makefile.in: Regenerate. --- binutils/ChangeLog | 5 +++++ binutils/doc/Makefile.am | 1 + binutils/doc/Makefile.in | 17 +++++------------ gas/ChangeLog | 6 ++++++ gas/doc/Makefile.am | 1 + gas/doc/Makefile.in | 7 ++----- gas/doc/c-arc.texi | 2 +- ld/ChangeLog | 5 +++++ ld/Makefile.am | 2 +- ld/Makefile.in | 13 +++++-------- 10 files changed, 32 insertions(+), 27 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 7d8d632a1fb..e6a3b3fcffe 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Joseph S. Myers + + * doc/Makefile.am (TEXI2DVI): Define. + * doc/Makefile.in: Regenerate. + 2006-05-31 Daniel Jacobowitz * Makefile.am: Replace INTLLIBS with LIBINTL everywhere. Add diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 4080826dd67..1d043e7d3f8 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -35,6 +35,7 @@ binutils_TEXINFOS = config.texi binutils_TEXI = $(srcdir)/binutils.texi AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI) rm -f config.texi diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index dbd7d6b7ffc..333a1af8c50 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -64,11 +64,6 @@ PDFS = binutils.pdf PSS = binutils.ps HTMLS = binutils.html TEXINFOS = binutils.texi -TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then \ - echo $(top_srcdir)/../texinfo/util/texi2dvi; \ - else \ - echo texi2dvi; \ - fi` TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) @@ -241,6 +236,7 @@ info_TEXINFOS = binutils.texi binutils_TEXINFOS = config.texi binutils_TEXI = $(srcdir)/binutils.texi AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" MAINTAINERCLEANFILES = config.texi MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; @@ -370,13 +366,10 @@ dist-info: $(INFO_DEPS) $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ if test -f $$base; then d=.; else d=$(srcdir); fi; \ - 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; \ + for file in $$d/$$base*; do \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ done; \ done diff --git a/gas/ChangeLog b/gas/ChangeLog index 98e17ac711f..3599bd60303 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2006-06-02 Joseph S. Myers + + * doc/Makefile.am (TEXI2DVI): Define. + * doc/Makefile.in: Regenerate. + * doc/c-arc.texi: Fix typo. + 2006-06-01 Alan Modra * config/obj-ieee.c: Delete. diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index 72f4b0e3bb5..83f6a3984c0 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -18,6 +18,7 @@ man_MANS = as.1 info_TEXINFOS = as.texinfo AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" asconfig.texi: $(CONFIG).texi rm -f asconfig.texi diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 2987873413f..e6589bfb70d 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -61,11 +61,6 @@ PDFS = as.pdf PSS = as.ps HTMLS = as.html TEXINFOS = as.texinfo -TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then \ - echo $(top_srcdir)/../texinfo/util/texi2dvi; \ - else \ - echo texi2dvi; \ - fi` TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) @@ -216,10 +211,12 @@ POD2MAN = pod2man --center="GNU Development Tools" \ man_MANS = as.1 info_TEXINFOS = as.texinfo AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" CPU_DOCS = \ c-alpha.texi \ c-arc.texi \ c-arm.texi \ + c-avr.texi \ c-bfin.texi \ c-d10v.texi \ c-cris.texi \ diff --git a/gas/doc/c-arc.texi b/gas/doc/c-arc.texi index 64285b8dd6c..04544d1e495 100644 --- a/gas/doc/c-arc.texi +++ b/gas/doc/c-arc.texi @@ -49,7 +49,7 @@ Base instruction set. Jump-and-link (jl) instruction. No requirement of an instruction between setting flags and conditional jump. For example: -@smallexample @ta +@smallexample mov.f r0,r1 beq foo @end smallexample diff --git a/ld/ChangeLog b/ld/ChangeLog index ebe2f0782d5..40885691758 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Joseph S. Myers + + * Makefile.am (TEXI2DVI): Add -I $(top_srcdir)/../libiberty. + * Makefile.in: Regenerate. + 2006-05-31 Daniel Jacobowitz * Makefile.am: Replace INTLLIBS and INTLDEPS with LIBINTL diff --git a/ld/Makefile.am b/ld/Makefile.am index 15ba0bbb4cb..6083035e96f 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -95,7 +95,7 @@ noinst_TEXINFOS = ldint.texinfo man_MANS = ld.1 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty -TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc +TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) @INCINTL@ $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\"" diff --git a/ld/Makefile.in b/ld/Makefile.in index 8a6163be0b9..6ea730d88d6 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -322,7 +322,7 @@ info_TEXINFOS = ld.texinfo noinst_TEXINFOS = ldint.texinfo man_MANS = ld.1 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty -TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc +TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) @INCINTL@ $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\"" BFDLIB = ../bfd/libbfd.la LIBIBERTY = ../libiberty/libiberty.a @@ -876,13 +876,10 @@ dist-info: $(INFO_DEPS) $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ if test -f $$base; then d=.; else d=$(srcdir); fi; \ - 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; \ + for file in $$d/$$base*; do \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ done; \ done -- 2.39.2