[PATCH] newlib: use .texi with libc & libm manuals
Mike Frysinger
vapier@gentoo.org
Sun Jan 2 01:29:29 GMT 2022
Newer automake warns that .texinfo extensions are discouraged in favor
of .texi, so rename the manuals to match.
---
newlib/libc/Makefile.am | 2 +-
newlib/libc/Makefile.in | 20 ++++++++++----------
newlib/libc/libc.in.xml | 2 +-
newlib/libc/{libc.texinfo => libc.texi} | 0
newlib/libm/Makefile.am | 2 +-
newlib/libm/Makefile.in | 20 ++++++++++----------
newlib/libm/configure | 2 +-
newlib/libm/configure.ac | 2 +-
newlib/libm/{libm.texinfo => libm.texi} | 0
9 files changed, 25 insertions(+), 25 deletions(-)
rename newlib/libc/{libc.texinfo => libc.texi} (100%)
rename newlib/libm/{libm.texinfo => libm.texi} (100%)
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 0789d5f48017..944a5a448108 100644
--- 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 77e3ba863d8e..e0446217dd6c 100644
--- a/newlib/libc/Makefile.in
+++ b/newlib/libc/Makefile.in
@@ -226,7 +226,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
@@ -546,7 +546,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)
@@ -562,7 +562,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)
@@ -643,7 +643,7 @@ clean-libtool:
distclean-libtool:
-rm -f libtool config.lt
-.texinfo.info:
+.texi.info:
$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
am__cwd=`pwd` && $(am__cd) $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
@@ -665,19 +665,19 @@ distclean-libtool:
fi; \
rm -rf $$backupdir; exit $$rc
-.texinfo.dvi:
+.texi.dvi:
$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
$<
-.texinfo.pdf:
+.texi.pdf:
$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
$<
-.texinfo.html:
+.texi.html:
$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $(@:.html=.htp) $<; \
@@ -686,9 +686,9 @@ distclean-libtool:
else \
rm -rf $(@:.html=.htp); 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:
$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
$(DVIPS) $(AM_V_texinfo) -o $@ $<
diff --git a/newlib/libc/libc.in.xml b/newlib/libc/libc.in.xml
index bf5f8a05f101..6afae0d7b0b1 100644
--- 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 514366bfa941..45d26ee2f76b 100644
--- 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 456df254a1a9..285e3730a179 100644
--- a/newlib/libm/Makefile.in
+++ b/newlib/libm/Makefile.in
@@ -205,7 +205,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
@@ -420,7 +420,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 ../..
@@ -428,7 +428,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)
@@ -509,7 +509,7 @@ clean-libtool:
distclean-libtool:
-rm -f libtool config.lt
-.texinfo.info:
+.texi.info:
$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
am__cwd=`pwd` && $(am__cd) $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
@@ -531,19 +531,19 @@ distclean-libtool:
fi; \
rm -rf $$backupdir; exit $$rc
-.texinfo.dvi:
+.texi.dvi:
$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
$<
-.texinfo.pdf:
+.texi.pdf:
$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
$<
-.texinfo.html:
+.texi.html:
$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $(@:.html=.htp) $<; \
@@ -552,9 +552,9 @@ distclean-libtool:
else \
rm -rf $(@:.html=.htp); 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:
$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
$(DVIPS) $(AM_V_texinfo) -o $@ $<
diff --git a/newlib/libm/configure b/newlib/libm/configure
index 2ef593aa9d71..5a42b250a1f1 100755
--- 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 8265cf0380ce..0167baec2f95 100644
--- 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.69)
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
--
2.33.0
More information about the Newlib
mailing list