makedoc: make errors visible

Discard QUICKREF sections, rather than writing them to stderr
Discard MATHREF sections, rather than discarding as an error
Pass NOTES sections through to texinfo, rather than discarding as an error
Don't redirect makedoc stderr to .ref file
Remove makedoc output on error
Remove .ref files from CLEANFILES
Regenerate Makefile.ins

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
This commit is contained in:
Jon Turney
2017-12-04 18:08:28 +00:00
parent 3476c8c868
commit c006fd459f
46 changed files with 139 additions and 182 deletions

View File

@ -263,7 +263,7 @@ CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str
DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py
DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml)
DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml)
CLEANFILES = $(CHEWOUT_FILES) $(CHEWOUT_FILES:.def=.ref) $(DOCBOOK_OUT_FILES)
CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
all: all-am
.SUFFIXES:
@ -572,8 +572,8 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
done
.c.def:
$(CHEW) < $< > $*.def 2> $*.ref
touch stmp-def
$(CHEW) < $< > $*.def || ( rm $*.def && false )
@touch stmp-def
TARGETDOC ?= ../tmp.texi

View File

@ -286,7 +286,7 @@ CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str
DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py
DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml)
DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml)
CLEANFILES = $(CHEWOUT_FILES) $(CHEWOUT_FILES:.def=.ref) $(DOCBOOK_OUT_FILES)
CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
all: all-am
.SUFFIXES:
@ -757,8 +757,8 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
done
.c.def:
$(CHEW) < $< > $*.def 2> $*.ref
touch stmp-def
$(CHEW) < $< > $*.def || ( rm $*.def && false )
@touch stmp-def
TARGETDOC ?= ../tmp.texi

View File

@ -273,7 +273,7 @@ CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str
DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py
DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml)
DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml)
CLEANFILES = $(CHEWOUT_FILES) $(CHEWOUT_FILES:.def=.ref) $(DOCBOOK_OUT_FILES)
CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
all: all-am
.SUFFIXES:
@ -660,8 +660,8 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
done
.c.def:
$(CHEW) < $< > $*.def 2> $*.ref
touch stmp-def
$(CHEW) < $< > $*.def || ( rm $*.def && false )
@touch stmp-def
TARGETDOC ?= ../tmp.texi

View File

@ -273,7 +273,7 @@ CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str
DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py
DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml)
DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml)
CLEANFILES = $(CHEWOUT_FILES) $(CHEWOUT_FILES:.def=.ref) $(DOCBOOK_OUT_FILES)
CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
all: all-am
.SUFFIXES:
@ -645,8 +645,8 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
done
.c.def:
$(CHEW) < $< > $*.def 2> $*.ref
touch stmp-def
$(CHEW) < $< > $*.def || ( rm $*.def && false )
@touch stmp-def
TARGETDOC ?= ../tmp.texi

View File

@ -272,7 +272,7 @@ CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str
DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py
DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml)
DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml)
CLEANFILES = $(CHEWOUT_FILES) $(CHEWOUT_FILES:.def=.ref) $(DOCBOOK_OUT_FILES)
CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
AM_CFLAGS = -DNOT_IN_libc -DHAVE_CONFIG_H -D_GNU_SOURCE -D__libc_enable_secure=1 -D'LOCALEDIR="$(msgcatdir)"' -D'LOCALE_ALIAS_PATH="$(msgcatdir)"' -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
# shouldn't have to do the following, but if needed
@ -639,8 +639,8 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
done
.c.def:
$(CHEW) < $< > $*.def 2> $*.ref
touch stmp-def
$(CHEW) < $< > $*.def || ( rm $*.def && false )
@touch stmp-def
TARGETDOC ?= ../tmp.texi

View File

@ -451,7 +451,7 @@ CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str
DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py
DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml)
DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml)
CLEANFILES = $(CHEWOUT_FILES) $(CHEWOUT_FILES:.def=.ref) $(DOCBOOK_OUT_FILES)
CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
AM_CFLAGS = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE=1
ACLOCAL_AMFLAGS = -I ../../../.. -I ../../../../..
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@ -1290,8 +1290,8 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
done
.c.def:
$(CHEW) < $< > $*.def 2> $*.ref
touch stmp-def
$(CHEW) < $< > $*.def || ( rm $*.def && false )
@touch stmp-def
TARGETDOC ?= ../tmp.texi

View File

@ -265,7 +265,7 @@ CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str
DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py
DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml)
DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml)
CLEANFILES = $(CHEWOUT_FILES) $(CHEWOUT_FILES:.def=.ref) $(DOCBOOK_OUT_FILES)
CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
AM_CFLAGS = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE=1
ACLOCAL_AMFLAGS = -I ../../../../../.. -I ../../../../../../..
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@ -566,8 +566,8 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
done
.c.def:
$(CHEW) < $< > $*.def 2> $*.ref
touch stmp-def
$(CHEW) < $< > $*.def || ( rm $*.def && false )
@touch stmp-def
TARGETDOC ?= ../tmp.texi

View File

@ -267,7 +267,7 @@ CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str
DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py
DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml)
DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml)
CLEANFILES = $(CHEWOUT_FILES) $(CHEWOUT_FILES:.def=.ref) $(DOCBOOK_OUT_FILES)
CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
ACLOCAL_AMFLAGS = -I ../../../../.. -I ../../../../../..
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
all: all-am
@ -579,8 +579,8 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
done
.c.def:
$(CHEW) < $< > $*.def 2> $*.ref
touch stmp-def
$(CHEW) < $< > $*.def || ( rm $*.def && false )
@touch stmp-def
TARGETDOC ?= ../tmp.texi

View File

@ -400,7 +400,7 @@ CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str
DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py
DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml)
DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml)
CLEANFILES = $(CHEWOUT_FILES) $(CHEWOUT_FILES:.def=.ref) $(DOCBOOK_OUT_FILES)
CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES)
all: all-am
.SUFFIXES:
@ -1600,8 +1600,8 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
done
.c.def:
$(CHEW) < $< > $*.def 2> $*.ref
touch stmp-def
$(CHEW) < $< > $*.def || ( rm $*.def && false )
@touch stmp-def
TARGETDOC ?= ../tmp.texi