newlib: use .texi with libc & libm manuals

Newer automake warns that .texinfo extensions are discouraged in favor
of .texi, so rename the manuals to match.

diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 0789d5f48017df843df2add8fb08efdf9cad16f2..944a5a448108f6b6d4924faf930ee69fc98c7a5d 100644 (file)
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -223,7 +223,7 @@ targetdep.tex: stmp-targetdep ; @true
 $(SUBDEFS): stmp-targetdep ; @true
 
 TEXINFO_TEX = ../../texinfo/texinfo.tex
-info_TEXINFOS = libc.texinfo
+info_TEXINFOS = libc.texi
 libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \
        targetdep.tex $(SUBDEFS)
 

diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in
index 97207033bbedc125dd78efccda29c34634183039..2fa5dd308ce0fb15b6b0bc87a589e7b535ce2309 100644 (file)
--- a/newlib/libc/Makefile.in
+++ b/newlib/libc/Makefile.in
@@ -152,7 +152,7 @@ DVIS = libc.dvi
 PDFS = libc.pdf
 PSS = libc.ps
 HTMLS = libc.html
-TEXINFOS = libc.texinfo
+TEXINFOS = libc.texi
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
@@ -449,7 +449,7 @@ SUBDEFS = \
 # ditto for stmp-xml files in each subdirectory which builds .xml files
 SUBXMLS = $(SUBDEFS:stmp-def=stmp-xml)
 TEXINFO_TEX = ../../texinfo/texinfo.tex
-info_TEXINFOS = libc.texinfo
+info_TEXINFOS = libc.texi
 libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \
        targetdep.tex $(SUBDEFS)
 
@@ -465,7 +465,7 @@ CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .dvi .html .info .lo .o .obj .pdf .ps .texinfo
+.SUFFIXES: .c .dvi .html .info .lo .o .obj .pdf .ps .texi
 am--refresh: Makefile
        @:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -543,7 +543,7 @@ clean-libtool:
 distclean-libtool:
        -rm -f libtool config.lt
 
-.texinfo.info:
+.texi.info:
        restore=: && backupdir="$(am__leading_dot)am$$$$" && \
        am__cwd=`pwd` && $(am__cd) $(srcdir) && \
        rm -rf $$backupdir && mkdir $$backupdir && \
@@ -565,17 +565,17 @@ distclean-libtool:
        fi; \
        rm -rf $$backupdir; exit $$rc
 
-.texinfo.dvi:
+.texi.dvi:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
        $(TEXI2DVI) $<
 
-.texinfo.pdf:
+.texi.pdf:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
        $(TEXI2PDF) $<
 
-.texinfo.html:
+.texi.html:
        rm -rf $(@:.html=.htp)
        if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
         -o $(@:.html=.htp) $<; \
@@ -588,9 +588,9 @@ distclean-libtool:
            rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
          exit 1; \
        fi
-$(srcdir)/libc.info: libc.texinfo $(libc_TEXINFOS)
-libc.pdf: libc.texinfo $(libc_TEXINFOS)
-libc.html: libc.texinfo $(libc_TEXINFOS)
+$(srcdir)/libc.info: libc.texi $(libc_TEXINFOS)
+libc.pdf: libc.texi $(libc_TEXINFOS)
+libc.html: libc.texi $(libc_TEXINFOS)
 .dvi.ps:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        $(DVIPS) -o $@ $<

diff --git a/newlib/libc/libc.in.xml b/newlib/libc/libc.in.xml
index bf5f8a05f101046e3071b4a3cb951ce358fd6d06..6afae0d7b0b10660907462dee49a4b0577980046 100644 (file)
--- a/newlib/libc/libc.in.xml
+++ b/newlib/libc/libc.in.xml
@@ -29,7 +29,7 @@
   <xi:include href="posix.xml">
       <xi:fallback/>
   </xi:include>
-  <!-- XXX: stdarg.h and vararg.h are directly described in libc.texinfo -->
+  <!-- XXX: stdarg.h and vararg.h are directly described in libc.texi -->
 
   <!-- iconv is optional -->
   <xi:include href="iconv.xml">

diff --git a/newlib/libc/libc.texinfo b/newlib/libc/libc.texi
similarity index 100%
rename from newlib/libc/libc.texinfo
rename to newlib/libc/libc.texi

diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am
index 514366bfa941a38ada2a6d66bf06999527a22858..45d26ee2f76b76c6a92cfbc6991eea08d4e9164d 100644 (file)
--- a/newlib/libm/Makefile.am
+++ b/newlib/libm/Makefile.am
@@ -34,7 +34,7 @@ endif
 $(SUBLIBS):
 
 TEXINFO_TEX = ../../texinfo/texinfo.tex
-info_TEXINFOS = libm.texinfo
+info_TEXINFOS = libm.texi
 libm_TEXINFOS = targetdep.tex
 
 libm.dvi: targetdep.tex math/stmp-def complex/stmp-def fenv/stmp-def

diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in
index 547e81276284ba42e06883a2aaed71f802897208..9af60a6ec27cc85380b9aaf20c210a7daf943fa9 100644 (file)
--- a/newlib/libm/Makefile.in
+++ b/newlib/libm/Makefile.in
@@ -131,7 +131,7 @@ DVIS = libm.dvi
 PDFS = libm.pdf
 PSS = libm.ps
 HTMLS = libm.html
-TEXINFOS = libm.texinfo
+TEXINFOS = libm.texi
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
@@ -323,7 +323,7 @@ libm_la_LDFLAGS = -Xcompiler -nostdlib
 @USE_LIBTOOL_TRUE@libm_la_LIBADD = $(SUBLIBS)
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = libm.a
 TEXINFO_TEX = ../../texinfo/texinfo.tex
-info_TEXINFOS = libm.texinfo
+info_TEXINFOS = libm.texi
 libm_TEXINFOS = targetdep.tex
 CLEANFILES = tmp.texi targetdep.tex stmp-targetdep *.xml *.3
 ACLOCAL_AMFLAGS = -I .. -I ../..
@@ -331,7 +331,7 @@ CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .dvi .html .info .lo .o .obj .pdf .ps .texinfo
+.SUFFIXES: .c .dvi .html .info .lo .o .obj .pdf .ps .texi
 am--refresh: Makefile
        @:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -409,7 +409,7 @@ clean-libtool:
 distclean-libtool:
        -rm -f libtool config.lt
 
-.texinfo.info:
+.texi.info:
        restore=: && backupdir="$(am__leading_dot)am$$$$" && \
        am__cwd=`pwd` && $(am__cd) $(srcdir) && \
        rm -rf $$backupdir && mkdir $$backupdir && \
@@ -431,17 +431,17 @@ distclean-libtool:
        fi; \
        rm -rf $$backupdir; exit $$rc
 
-.texinfo.dvi:
+.texi.dvi:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
        $(TEXI2DVI) $<
 
-.texinfo.pdf:
+.texi.pdf:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
        $(TEXI2PDF) $<
 
-.texinfo.html:
+.texi.html:
        rm -rf $(@:.html=.htp)
        if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
         -o $(@:.html=.htp) $<; \
@@ -454,9 +454,9 @@ distclean-libtool:
            rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
          exit 1; \
        fi
-$(srcdir)/libm.info: libm.texinfo $(libm_TEXINFOS)
-libm.pdf: libm.texinfo $(libm_TEXINFOS)
-libm.html: libm.texinfo $(libm_TEXINFOS)
+$(srcdir)/libm.info: libm.texi $(libm_TEXINFOS)
+libm.pdf: libm.texi $(libm_TEXINFOS)
+libm.html: libm.texi $(libm_TEXINFOS)
 .dvi.ps:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        $(DVIPS) -o $@ $<

diff --git a/newlib/libm/configure b/newlib/libm/configure
index 970bfec0a903b90e7d16612e2c260ebd2beb2c87..a60192f4bceea6d068491526e3d7e227090f4c6f 100755 (executable)
--- a/newlib/libm/configure
+++ b/newlib/libm/configure
@@ -592,7 +592,7 @@ PACKAGE_STRING='newlib 4.2.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
-ac_unique_file="libm.texinfo"
+ac_unique_file="libm.texi"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>

diff --git a/newlib/libm/configure.ac b/newlib/libm/configure.ac
index aec22bd4e5ba842e7e1a2968246d1a439e6a217d..2eb63d24b60ed34087888eb46aca904f5a559ec2 100644 (file)
--- a/newlib/libm/configure.ac
+++ b/newlib/libm/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 AC_INIT([newlib],[NEWLIB_VERSION])
-AC_CONFIG_SRCDIR([libm.texinfo])
+AC_CONFIG_SRCDIR([libm.texi])
 
 AC_ARG_ENABLE(newlib_hw_fp,
 [  --enable-newlib-hw-fp    Turn on hardware floating point math],

diff --git a/newlib/libm/libm.texinfo b/newlib/libm/libm.texi
similarity index 100%
rename from newlib/libm/libm.texinfo
rename to newlib/libm/libm.texi