Revert "Make newlib manpages via DocBook XML (v3)"

This reverts commit 041ea41068.
This commit is contained in:
Jon Turney
2016-06-25 17:07:43 +01:00
parent 041ea41068
commit f145c2e261
16 changed files with 4 additions and 1047 deletions

View File

@ -142,9 +142,6 @@ SUBDEFS = \
$(LIBC_EXTRA_DEF) \
misc/stmp-def
# ditto for stmp-xml files in each subdirectory which builds .xml files
SUBXMLS = $(SUBDEFS:stmp-def=stmp-xml)
libc.info: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \
targetdep.tex $(SUBDEFS)
@ -226,23 +223,6 @@ info_TEXINFOS = libc.texinfo
libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \
targetdep.tex $(SUBDEFS)
docbook-recursive: force
for d in $(SUBDIRS); do \
if test "$$d" != "."; then \
(cd $$d && $(MAKE) docbook) || exit 1; \
fi; \
done
$(SUBXMLS): docbook-recursive
man: $(SUBXMLS) libc.in.xml
xsltproc --xinclude --path ${builddir} --nonet ${srcdir}/../refcontainers.xslt ${srcdir}/libc.in.xml >libc.xml
xmlto --skip-validation man -m ${srcdir}/../man.xsl libc.xml
install-man: man
mkdir -p $(DESTDIR)$(mandir)/man3
$(INSTALL_DATA) *.3 $(DESTDIR)$(mandir)/man3
.PHONY: force
force:
@ -250,8 +230,7 @@ CLEANFILES = $(CRT0) \
sigset.texi stmp-sigset extra.texi stmp-extra \
stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \
tmp-sigset.texi tmp-iconvset.texi tmp-extra.texi \
tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi \
*.xml *.3
tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi
ACLOCAL_AMFLAGS = -I .. -I ../..
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host

View File

@ -18,9 +18,6 @@ CHAPTERS = iconv.tex
iconv.def: lib/iconv.def
cp lib/iconv.def iconv.def
iconv.xml: lib/iconv.xml
cp lib/iconv.xml iconv.xml
stmp-def: force
(cd lib && $(MAKE) doc)
touch $@

View File

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<book id="libc" xmlns:xi="http://www.w3.org/2001/XInclude">
<bookinfo>
<productname>newlib</productname>
</bookinfo>
<xi:include href="stdlib.xml"/>
<xi:include href="ctype.xml"/>
<xi:include href="stdio.xml"/>
<!-- stdio64 is optional -->
<xi:include href="stdio64.xml">
<xi:fallback/>
</xi:include>
<xi:include href="strings.xml"/>
<xi:include href="wcstrings.xml"/>
<!-- signals is optional -->
<xi:include href="signal.xml">
<xi:fallback/>
</xi:include>
<xi:include href="time.xml"/>
<xi:include href="locale.xml"/>
<!-- reent.tex contains fixed content and nothing seems to include the .def made in reent/ -->
<xi:include href="misc.xml"/>
<!-- posix is optional -->
<xi:include href="posix.xml">
<xi:fallback/>
</xi:include>
<!-- XXX: stdarg.h and vararg.h are directly described in libc.texinfo -->
<!-- iconv is optional -->
<xi:include href="iconv.xml">
<xi:fallback/>
</xi:include>
<!-- processing should insert index here -->
<index/>
</book>

View File

@ -22,7 +22,5 @@ $(machine_dir)/lib.a:
doc:
docbook:
ACLOCAL_AMFLAGS = -I ../.. -I ../../..
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host

View File

@ -33,7 +33,5 @@ CLEANFILES = $(CRT0)
doc:
docbook:
ACLOCAL_AMFLAGS = -I ../.. -I ../../..
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host