diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 8 | ||||
| -rw-r--r-- | gas/Makefile.in | 4 | ||||
| -rw-r--r-- | gas/aclocal.m4 | 4 | ||||
| -rw-r--r-- | gas/doc/Makefile.am | 5 | ||||
| -rw-r--r-- | gas/doc/Makefile.in | 26 | ||||
| -rw-r--r-- | gas/doc/as.texinfo | 2 |
6 files changed, 31 insertions, 18 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 8ab4b75..baebce1 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2006-05-02 Daniel Jacobowitz <dan@codesourcery.com> + + * doc/Makefile.am (AM_MAKEINFOFLAGS): New. + (TEXI2POD): Use AM_MAKEINFOFLAGS. + (asconfig.texi): Don't set top_srcdir. + * doc/as.texinfo: Don't use top_srcdir. + * aclocal.m4, Makefile.in, doc/Makefile.in: Regenerated. + 2006-05-02 Paul Brook <paul@codesourcery.com> * config/tc-arm.c (arm_optimize_expr): New function. diff --git a/gas/Makefile.in b/gas/Makefile.in index bdd1448..190d01c 100644 --- a/gas/Makefile.in +++ b/gas/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, @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(as_new_SOURCES) $(EXTRA_as_new_SOURCES) $(itbl_test_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ diff --git a/gas/aclocal.m4 b/gas/aclocal.m4 index ca84997..cd42673 100644 --- a/gas/aclocal.m4 +++ b/gas/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/gas/doc/Makefile.am b/gas/doc/Makefile.am index cc806ca..99e8390 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -8,7 +8,7 @@ CONFIG=all # Options to extract the man page from as.texinfo MANCONF = -Dman -TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl +TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS) POD2MAN = pod2man --center="GNU Development Tools" \ --release="binutils-$(VERSION)" --section=1 @@ -17,11 +17,12 @@ man_MANS = as.1 info_TEXINFOS = as.texinfo +AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" + asconfig.texi: $(CONFIG).texi rm -f asconfig.texi cp $(srcdir)/$(CONFIG).texi ./asconfig.texi chmod u+w ./asconfig.texi - echo "@set top_srcdir $(top_srcdir)" >> ./asconfig.texi CPU_DOCS = \ c-alpha.texi \ diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 687e472..75646b6 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/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, @@ -211,12 +211,13 @@ CONFIG = all # Options to extract the man page from as.texinfo MANCONF = -Dman -TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl +TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS) POD2MAN = pod2man --center="GNU Development Tools" \ --release="binutils-$(VERSION)" --section=1 man_MANS = as.1 info_TEXINFOS = as.texinfo +AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" CPU_DOCS = \ c-alpha.texi \ c-arc.texi \ @@ -308,9 +309,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 $@ $<; \ @@ -352,6 +355,7 @@ as.dvi: as.texinfo as.pdf: as.texinfo as.html: as.texinfo .dvi.ps: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ $(DVIPS) -o $@ $< uninstall-info-am: @@ -384,10 +388,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 @@ -585,7 +592,6 @@ asconfig.texi: $(CONFIG).texi rm -f asconfig.texi cp $(srcdir)/$(CONFIG).texi ./asconfig.texi chmod u+w ./asconfig.texi - echo "@set top_srcdir $(top_srcdir)" >> ./asconfig.texi gasver.texi: $(srcdir)/../../bfd/configure rm -f $@ diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo index dfe7860..dbf1d7d 100644 --- a/gas/doc/as.texinfo +++ b/gas/doc/as.texinfo @@ -451,7 +451,7 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}. @c man begin OPTIONS @table @gcctabopt -@include @value{top_srcdir}/../libiberty/at-file.texi +@include at-file.texi @item -a[cdhlmns] Turn on listings, in any of a variety of ways: |