From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id DA44A385842C; Sat, 5 Feb 2022 05:20:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA44A385842C Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: move man page generation into top-level build X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: fc2b4ffee0ec7697a02ae7185f1acb7927f2f115 X-Git-Newrev: 6026ef29d8c847716a745bb6e11aa1d2c36a2b64 Message-Id: <20220205052058.DA44A385842C@sourceware.org> Date: Sat, 5 Feb 2022 05:20:58 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Feb 2022 05:20:59 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D6026ef29d8c= 847716a745bb6e11aa1d2c36a2b64 commit 6026ef29d8c847716a745bb6e11aa1d2c36a2b64 Author: Mike Frysinger Date: Fri Jan 21 22:50:42 2022 -0500 newlib: move man page generation into top-level build =20 This allows building the libc & libm pages in parallel, and drops the duplication in the subdirs with the chew/chapter settings. =20 The unused rules in Makefile.shared are left in place to minimize noise in the change. Diff: --- newlib/Makefile.am | 16 -- newlib/Makefile.in | 73 +++++-- newlib/doc/local.mk | 12 ++ newlib/libc/Makefile.am | 78 +------ newlib/libc/Makefile.in | 449 ++++--------------------------------= ---- newlib/libc/Makefile.inc | 24 ++- newlib/libc/ctype/Makefile.am | 6 - newlib/libc/ctype/Makefile.in | 15 +- newlib/libc/iconv/Makefile.am | 6 - newlib/libc/iconv/Makefile.in | 8 +- newlib/libc/locale/Makefile.am | 6 - newlib/libc/locale/Makefile.in | 9 +- newlib/libc/misc/Makefile.am | 6 - newlib/libc/misc/Makefile.in | 8 +- newlib/libc/posix/Makefile.am | 6 - newlib/libc/posix/Makefile.in | 8 +- newlib/libc/reent/Makefile.am | 6 - newlib/libc/reent/Makefile.in | 12 +- newlib/libc/search/Makefile.am | 6 - newlib/libc/search/Makefile.in | 8 +- newlib/libc/signal/Makefile.am | 6 - newlib/libc/signal/Makefile.in | 8 +- newlib/libc/ssp/Makefile.am | 6 - newlib/libc/ssp/Makefile.in | 8 +- newlib/libc/stdio/Makefile.am | 6 - newlib/libc/stdio/Makefile.in | 24 +-- newlib/libc/stdio64/Makefile.am | 6 - newlib/libc/stdio64/Makefile.in | 10 +- newlib/libc/stdlib/Makefile.am | 6 - newlib/libc/stdlib/Makefile.in | 17 +- newlib/libc/string/Makefile.am | 6 - newlib/libc/string/Makefile.in | 26 +-- newlib/libc/time/Makefile.am | 6 - newlib/libc/time/Makefile.in | 14 +- newlib/libm/Makefile.am | 22 -- newlib/libm/Makefile.in | 24 +-- newlib/libm/Makefile.inc | 24 ++- newlib/libm/common/Makefile.am | 6 - newlib/libm/common/Makefile.in | 13 +- newlib/libm/complex/Makefile.am | 6 - newlib/libm/complex/Makefile.in | 11 +- newlib/libm/fenv/Makefile.am | 6 - newlib/libm/fenv/Makefile.in | 11 +- newlib/libm/math/Makefile.am | 6 - newlib/libm/math/Makefile.in | 13 +- newlib/libm/mathfp/Makefile.am | 6 - newlib/libm/mathfp/Makefile.in | 14 +- 47 files changed, 203 insertions(+), 870 deletions(-) diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 99fa0d77f..1e35e6430 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -420,22 +420,6 @@ unidata: # Force makedoc to be built before building info files. info-recursive dvi-recursive: doc/makedoc$(EXEEXT_FOR_BUILD) =20 -# Recursive targets for man and install-man -man: - $(MAKE) man-cache || exit 1; \ - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ - (cd $$d && $(MAKE) man) || exit 1; \ - fi; \ - done - -install-man: - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ - (cd $$d && $(MAKE) install-man) || exit 1; \ - fi; \ - done - CONFIG_STATUS_DEPENDENCIES =3D $(newlib_basedir)/configure.host =20 include ../multilib.am diff --git a/newlib/Makefile.in b/newlib/Makefile.in index a77de7281..71c4bfb79 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -100,7 +100,7 @@ host_triplet =3D @host@ # # Subdir documentation rules. # -@HAVE_DOC_TRUE@am__append_5 =3D .def +@HAVE_DOC_TRUE@am__append_5 =3D .def .xml @HAVE_ICONVDATA_TRUE@am__append_6 =3D iconvdata/EUC-JP.la @ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@am__append_7 =3D \ @ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@ iconvdata/euc-jp.c \ @@ -644,8 +644,10 @@ libc_la_LDFLAGS =3D -version-info $(LIBTOOL_VERSION_IN= FO) -release newlib -no-unde @USE_LIBTOOL_TRUE@libc_la_DEPENDENCIES =3D libc-libtool-objectlist CLEANFILES =3D stmp-targ-include libc/targetdep.tex \ libc/targetdep.tex.stamp $(LIBC_CHEWOUT_FILES) \ + $(LIBC_DOCBOOK_OUT_FILES) libc/*.xml libc/*.xml.stamp libc/*.3 \ libm/targetdep.tex libm/targetdep.tex.stamp \ - $(LIBM_CHEWOUT_FILES) + $(LIBM_CHEWOUT_FILES) $(LIBM_DOCBOOK_OUT_FILES) libm/*.xml \ + libm/*.xml.stamp libm/*.3 CONFIG_STATUS_DEPENDENCIES =3D $(newlib_basedir)/configure.host MULTISRCTOP =3D=20 MULTIBUILDTOP =3D=20 @@ -664,6 +666,12 @@ TEXI2DVI =3D texi2dvi -E TEXINFO_TEX =3D ../texinfo/texinfo.tex @HAVE_DOC_TRUE@MKDOC =3D doc/makedoc$(EXEEXT_FOR_BUILD) @HAVE_DOC_TRUE@CHEW =3D $(MKDOC) -f $(srcdir)/doc/doc.str +@HAVE_DOC_TRUE@DOCBOOK_CHEW =3D ${top_srcdir}/doc/makedocbook.py + +# We can't use .tex.xml rule here as it'll conflict with .c.xml when the c= hapter +# name (e.g. "stdio.xml") matches a source file name (e.g. "stdio.c"). We= 've +# been flattening chapters into the main library dir (e.g. libc/) to avoid= that. +@HAVE_DOC_TRUE@TEXI2DOCBOOK =3D $(top_srcdir)/doc/chapter-texi2docbook.py @HAVE_ICONVDATA_TRUE@iconvdata_EUC_JP_la_SOURCES =3D iconvdata/dummy.c \ @HAVE_ICONVDATA_TRUE@ $(am__append_7) @HAVE_ICONVDATA_TRUE@iconvdata_EUC_JP_la_DEPENDENCIES =3D $(iconvdata_EUC_= JP_la_LIBADD) @@ -832,6 +840,7 @@ LIBC_CHAPTERS =3D libc/sys.tex libc/ctype/ctype.tex lib= c/iconv/iconv.tex \ libc/stdio64/stdio64.tex libc/stdio/stdio.tex \ libc/stdlib/stdlib.tex libc/string/strings.tex \ libc/string/wcstrings.tex libc/time/time.tex +LIBC_DOCBOOK_OUT_FILES =3D $(LIBC_CHEWOUT_FILES:.def=3D.xml) libm_libm_TEXINFOS =3D libm/targetdep.tex $(LIBM_CHEWOUT_FILES) LIBM_CHEWOUT_FILES =3D libm/common/s_cbrt.def libm/common/s_copysign.def \ libm/common/s_exp10.def libm/common/s_expm1.def \ @@ -867,11 +876,12 @@ LIBM_CHEWOUT_FILES =3D libm/common/s_cbrt.def libm/co= mmon/s_copysign.def \ $(am__append_8) $(am__append_10) LIBM_CHAPTERS =3D libm/complex/complex.tex libm/fenv/fenv.tex \ $(am__append_9) $(am__append_11) +LIBM_DOCBOOK_OUT_FILES =3D $(LIBM_CHEWOUT_FILES:.def=3D.xml) all: newlib.h _newlib_version.h $(MAKE) $(AM_MAKEFLAGS) all-recursive =20 .SUFFIXES: -.SUFFIXES: .def .c .dvi .lo .o .obj .ps +.SUFFIXES: .def .xml .c .dvi .lo .o .obj .ps am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../multilib.am $(srcdir)/doc/local.mk $(srcdir)/iconvdata/Makefile.inc = $(srcdir)/libc/Makefile.inc $(srcdir)/libc/ctype/Makefile.inc $(srcdir)/lib= c/iconv/Makefile.inc $(srcdir)/libc/iconv/lib/Makefile.inc $(srcdir)/libc/l= ocale/Makefile.inc $(srcdir)/libc/misc/Makefile.inc $(srcdir)/libc/posix/Ma= kefile.inc $(srcdir)/libc/reent/Makefile.inc $(srcdir)/libc/search/Makefile= .inc $(srcdir)/libc/signal/Makefile.inc $(srcdir)/libc/ssp/Makefile.inc $(s= rcdir)/libc/stdio64/Makefile.inc $(srcdir)/libc/stdio/Makefile.inc $(srcdir= )/libc/stdlib/Makefile.inc $(srcdir)/libc/string/Makefile.inc $(srcdir)/lib= c/time/Makefile.inc $(srcdir)/libm/Makefile.inc $(srcdir)/libm/common/Makef= ile.inc $(srcdir)/libm/complex/Makefile.inc $(srcdir)/libm/fenv/Makefile.in= c $(srcdir)/libm/mathfp/Makefile.inc $(srcdir)/libm/math/Makefile.inc $(am_= _configure_deps) @@ -1938,22 +1948,6 @@ unidata: # Force makedoc to be built before building info files. info-recursive dvi-recursive: doc/makedoc$(EXEEXT_FOR_BUILD) =20 -# Recursive targets for man and install-man -man: - $(MAKE) man-cache || exit 1; \ - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ - (cd $$d && $(MAKE) man) || exit 1; \ - fi; \ - done - -install-man: - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ - (cd $$d && $(MAKE) install-man) || exit 1; \ - fi; \ - done - # GNU Make needs to see an explicit $(MAKE) variable in the command it # runs to enable its job server during parallel builds. Hence the # comments below. @@ -2064,6 +2058,9 @@ clean-local: @HAVE_DOC_TRUE@.c.def: @HAVE_DOC_TRUE@ $(AM_V_GEN)$(CHEW) < $< > $*.def || ( rm $*.def && false ) =20 +@HAVE_DOC_TRUE@.c.xml: +@HAVE_DOC_TRUE@ $(AM_V_GEN)$(DOCBOOK_CHEW) < $< > $*.xml || ( rm $*.xml &&= false ) + libc/libc.dvi: libc/targetdep.tex $(LIBC_CHEWOUT_FILES) =20 libc/targetdep.tex.stamp: $(LIBC_CHAPTERS) @@ -2072,6 +2069,25 @@ libc/targetdep.tex.stamp: $(LIBC_CHAPTERS) $(AM_V_at)touch $@ libc/targetdep.tex: libc/targetdep.tex.stamp; @true =20 +libc/libc.xml.stamp: libc/libc.in.xml $(LIBC_CHAPTERS) $(LIBC_DOCBOOK_OUT_= FILES) + $(AM_V_at)\ + for chapter in $(LIBC_CHAPTERS); do \ + $(TEXI2DOCBOOK) < $(srcdir)/$$chapter > libc/`basename $${chapter%.tex}= `.xml || exit 1; \ + done + $(AM_V_GEN)xsltproc --xinclude --path $(builddir)/libc --nonet $(srcdir)/= refcontainers.xslt $< > $@.tmp + $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $(@:.stamp= =3D) + $(AM_V_at)touch $@ +libc/libc.xml: libc/libc.xml.stamp; @true + +libc_man: libc/libc.xml + $(AM_V_GEN)xmlto --skip-validation -o libc --searchpath $(builddir)/libc = man -m $(srcdir)/man.xsl libc/libc.xml +man: libc_man + +libc_install-man: libc_man + $(MKDIR_P) $(DESTDIR)$(mandir)/man3 + $(INSTALL_DATA) libc/*.3 $(DESTDIR)$(mandir)/man3/ +install-man: libc_install-man + libm/libm.dvi: libm/targetdep.tex $(LIBM_CHEWOUT_FILES) =20 libm/targetdep.tex.stamp: $(LIBM_CHAPTERS) @@ -2080,6 +2096,25 @@ libm/targetdep.tex.stamp: $(LIBM_CHAPTERS) $(AM_V_at)touch $@ libm/targetdep.tex: libm/targetdep.tex.stamp; @true =20 +libm/libm.xml.stamp: libm/libm.in.xml $(LIBM_CHAPTERS) $(LIBM_DOCBOOK_OUT_= FILES) + $(AM_V_at)\ + for chapter in $(LIBM_CHAPTERS); do \ + $(TEXI2DOCBOOK) < $(srcdir)/$$chapter > libm/`basename $${chapter%.tex}= `.xml || exit 1; \ + done + $(AM_V_GEN)xsltproc --xinclude --path $(builddir)/libm --nonet $(srcdir)/= refcontainers.xslt $< > $@.tmp + $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $(@:.stamp= =3D) + $(AM_V_at)touch $@ +libm/libm.xml: libm/libm.xml.stamp; @true + +libm_man: libm/libm.xml + $(AM_V_GEN)xmlto --skip-validation -o libm --searchpath $(builddir)/libm = man -m $(srcdir)/man.xsl libm/libm.xml +man: libm_man + +libm_install-man: libm_man + $(MKDIR_P) $(DESTDIR)$(mandir)/man3 + $(INSTALL_DATA) libm/*.3 $(DESTDIR)$(mandir)/man3/ +install-man: libm_install-man + .PHONY: $(PHONY) =20 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/newlib/doc/local.mk b/newlib/doc/local.mk index 5c867c998..15c43f225 100644 --- a/newlib/doc/local.mk +++ b/newlib/doc/local.mk @@ -29,3 +29,15 @@ CHEW =3D $(MKDOC) -f $(srcdir)/%D%/doc.str =20 .c.def: $(AM_V_GEN)$(CHEW) < $< > $*.def || ( rm $*.def && false ) + +SUFFIXES +=3D .xml + +DOCBOOK_CHEW =3D ${top_srcdir}/%D%/makedocbook.py + +.c.xml: + $(AM_V_GEN)$(DOCBOOK_CHEW) < $< > $*.xml || ( rm $*.xml && false ) + +# We can't use .tex.xml rule here as it'll conflict with .c.xml when the c= hapter +# name (e.g. "stdio.xml") matches a source file name (e.g. "stdio.c"). We= 've +# been flattening chapters into the main library dir (e.g. libc/) to avoid= that. +TEXI2DOCBOOK =3D $(top_srcdir)/%D%/chapter-texi2docbook.py diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index 4e0b8fdf2..7e41b9145 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -124,77 +124,13 @@ endif # USE_LIBTOOL =20 $(SUBLIBS): ; @true =20 -# This is a list of the stmp-def files in each subdirectory which -# builds .def files. We don't list subdirectories which don't build -# .def files; if the list of subdirectories changes, we must change -# this as well. -SUBDEFS =3D \ - stdlib/stmp-def \ - ctype/stmp-def \ - stdio/stmp-def \ - stdio64/stmp-def \ - posix/stmp-def \ - xdr/stmp-def \ - string/stmp-def \ - signal/stmp-def \ - time/stmp-def \ - locale/stmp-def \ - reent/stmp-def \ - misc/stmp-def - -# ditto for stmp-xml files in each subdirectory which builds .xml files -SUBXMLS =3D $(SUBDEFS:stmp-def=3Dstmp-xml) - -libc.info: targetdep.tex $(SUBDEFS) - -libc.dvi: targetdep.tex $(SUBDEFS) - -stmp-targetdep: force - rm -f tmp-targetdep.texi - targetdoc=3D`pwd`/tmp-targetdep.texi; \ - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "." && test "$$d" !=3D "$(LIBC_MACHINE_DIR)"; then \ - (cd $$d && $(MAKE) TARGETDOC=3D$${targetdoc} doc) || exit 1; \ - fi; \ - done - cat $(srcdir)/sys.tex >>tmp-targetdep.texi - $(SHELL) $(newlib_basedir)/../move-if-change tmp-targetdep.texi targetdep= .tex - touch $@ - -targetdep.tex: stmp-targetdep ; @true - -$(SUBDEFS): stmp-targetdep ; @true - -TEXINFO_TEX =3D ../../texinfo/texinfo.tex -info_TEXINFOS =3D libc.texi -libc_TEXINFOS =3D targetdep.tex $(SUBDEFS) - -docbook-recursive: force - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "." && test "$$d" !=3D "$(LIBC_MACHINE_DIR)"; 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: - -CLEANFILES =3D \ - sigset.texi stmp-sigset \ - stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \ - tmp-sigset.texi tmp-iconvset.texi \ - tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi \ - *.xml *.3 +crt0.o: sys/crt0.o + rm -f $@ + ln sys/crt0.o $@ >/dev/null 2>/dev/null || cp sys/crt0.o $@ + +sys/crt0.o: ; @true + +CLEANFILES =3D $(CRT0) =20 ACLOCAL_AMFLAGS =3D -I .. -I ../.. -I ../../config CONFIG_STATUS_DEPENDENCIES =3D $(newlib_basedir)/configure.host diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in index 154eadf41..3e57b1ed7 100644 --- a/newlib/libc/Makefile.in +++ b/newlib/libc/Makefile.in @@ -201,46 +201,6 @@ am__v_CCLD_ =3D $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 =3D @echo " CCLD " $@; am__v_CCLD_1 =3D=20 SOURCES =3D libc.c $(libc_la_SOURCES) -AM_V_DVIPS =3D $(am__v_DVIPS_@AM_V@) -am__v_DVIPS_ =3D $(am__v_DVIPS_@AM_DEFAULT_V@) -am__v_DVIPS_0 =3D @echo " DVIPS " $@; -am__v_DVIPS_1 =3D=20 -AM_V_MAKEINFO =3D $(am__v_MAKEINFO_@AM_V@) -am__v_MAKEINFO_ =3D $(am__v_MAKEINFO_@AM_DEFAULT_V@) -am__v_MAKEINFO_0 =3D @echo " MAKEINFO" $@; -am__v_MAKEINFO_1 =3D=20 -AM_V_INFOHTML =3D $(am__v_INFOHTML_@AM_V@) -am__v_INFOHTML_ =3D $(am__v_INFOHTML_@AM_DEFAULT_V@) -am__v_INFOHTML_0 =3D @echo " INFOHTML" $@; -am__v_INFOHTML_1 =3D=20 -AM_V_TEXI2DVI =3D $(am__v_TEXI2DVI_@AM_V@) -am__v_TEXI2DVI_ =3D $(am__v_TEXI2DVI_@AM_DEFAULT_V@) -am__v_TEXI2DVI_0 =3D @echo " TEXI2DVI" $@; -am__v_TEXI2DVI_1 =3D=20 -AM_V_TEXI2PDF =3D $(am__v_TEXI2PDF_@AM_V@) -am__v_TEXI2PDF_ =3D $(am__v_TEXI2PDF_@AM_DEFAULT_V@) -am__v_TEXI2PDF_0 =3D @echo " TEXI2PDF" $@; -am__v_TEXI2PDF_1 =3D=20 -AM_V_texinfo =3D $(am__v_texinfo_@AM_V@) -am__v_texinfo_ =3D $(am__v_texinfo_@AM_DEFAULT_V@) -am__v_texinfo_0 =3D -q -am__v_texinfo_1 =3D=20 -AM_V_texidevnull =3D $(am__v_texidevnull_@AM_V@) -am__v_texidevnull_ =3D $(am__v_texidevnull_@AM_DEFAULT_V@) -am__v_texidevnull_0 =3D > /dev/null -am__v_texidevnull_1 =3D=20 -INFO_DEPS =3D $(srcdir)/libc.info -am__TEXINFO_TEX_DIR =3D $(srcdir)/../../texinfo -DVIS =3D libc.dvi -PDFS =3D libc.pdf -PSS =3D libc.ps -HTMLS =3D libc.html -TEXINFOS =3D libc.texi -TEXI2DVI =3D texi2dvi -TEXI2PDF =3D $(TEXI2DVI) --pdf --batch -MAKEINFOHTML =3D $(MAKEINFO) --html -AM_MAKEINFOHTMLFLAGS =3D $(AM_MAKEINFOFLAGS) -DVIPS =3D dvips RECURSIVE_TARGETS =3D all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -254,33 +214,6 @@ am__can_run_installinfo =3D \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__vpath_adj_setup =3D srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj =3D case $$p in \ - $(srcdir)/*) f=3D`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=3D$$p;; \ - esac; -am__strip_dir =3D f=3D`echo $$p | sed -e 's|^.*/||'`; -am__install_max =3D 40 -am__nobase_strip_setup =3D \ - srcdirstrip=3D`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip =3D \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list =3D $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' |= \ - $(AWK) 'BEGIN { files["."] =3D "" } { files[$$2] =3D files[$$2] " " $$1;= \ - if (++n[$$2] =3D=3D $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] =3D 0; files[$$2] =3D "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list =3D \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir =3D { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } DATA =3D $(noinst_DATA) RECURSIVE_CLEAN_TARGETS =3D mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -527,44 +460,13 @@ libc_la_LDFLAGS =3D -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@libc_la_SOURCES =3D=20 @USE_LIBTOOL_TRUE@libc_la_LIBADD =3D $(SUBLIBS) @USE_LIBTOOL_TRUE@libc_la_DEPENDENCIES =3D $(SUBLIBS) - -# This is a list of the stmp-def files in each subdirectory which -# builds .def files. We don't list subdirectories which don't build -# .def files; if the list of subdirectories changes, we must change -# this as well. -SUBDEFS =3D \ - stdlib/stmp-def \ - ctype/stmp-def \ - stdio/stmp-def \ - stdio64/stmp-def \ - posix/stmp-def \ - xdr/stmp-def \ - string/stmp-def \ - signal/stmp-def \ - time/stmp-def \ - locale/stmp-def \ - reent/stmp-def \ - misc/stmp-def - - -# ditto for stmp-xml files in each subdirectory which builds .xml files -SUBXMLS =3D $(SUBDEFS:stmp-def=3Dstmp-xml) -TEXINFO_TEX =3D ../../texinfo/texinfo.tex -info_TEXINFOS =3D libc.texi -libc_TEXINFOS =3D targetdep.tex $(SUBDEFS) -CLEANFILES =3D \ - sigset.texi stmp-sigset \ - stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \ - tmp-sigset.texi tmp-iconvset.texi \ - tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi \ - *.xml *.3 - +CLEANFILES =3D $(CRT0) ACLOCAL_AMFLAGS =3D -I .. -I ../.. -I ../../config CONFIG_STATUS_DEPENDENCIES =3D $(newlib_basedir)/configure.host all: all-recursive =20 .SUFFIXES: -.SUFFIXES: .c .dvi .html .info .lo .o .obj .pdf .ps .texi +.SUFFIXES: .c .lo .o .obj am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am_= _configure_deps) @@ -645,146 +547,6 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt =20 -.texi.info: - $(AM_V_MAKEINFO)restore=3D: && backupdir=3D"$(am__leading_dot)am$$$$" && \ - am__cwd=3D`pwd` && $(am__cd) $(srcdir) && \ - rm -rf $$backupdir && mkdir $$backupdir && \ - if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ - for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=3D).i[0-9] $(@:.info=3D).i= [0-9][0-9]; do \ - if test -f $$f; then mv $$f $$backupdir; restore=3Dmv; else :; fi; \ - done; \ - else :; fi && \ - cd "$$am__cwd"; \ - if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $@ $<; \ - then \ - rc=3D0; \ - $(am__cd) $(srcdir); \ - else \ - rc=3D$$?; \ - $(am__cd) $(srcdir) && \ - $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ - fi; \ - rm -rf $$backupdir; exit $$rc - -.texi.dvi: - $(AM_V_TEXI2DVI)TEXINPUTS=3D"$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEX= INPUTS" \ - MAKEINFO=3D'$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)= ' \ - $(TEXI2DVI) $(AM_V_texinfo) --build-dir=3D$(@:.dvi=3D.t2d) -o $@ $(AM_V_t= exidevnull) \ - $< - -.texi.pdf: - $(AM_V_TEXI2PDF)TEXINPUTS=3D"$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEX= INPUTS" \ - MAKEINFO=3D'$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)= ' \ - $(TEXI2PDF) $(AM_V_texinfo) --build-dir=3D$(@:.pdf=3D.t2p) -o $@ $(AM_V_t= exidevnull) \ - $< - -.texi.html: - $(AM_V_MAKEINFO)rm -rf $(@:.html=3D.htp) - $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I = $(srcdir) \ - -o $(@:.html=3D.htp) $<; \ - then \ - rm -rf $@ && mv $(@:.html=3D.htp) $@; \ - else \ - rm -rf $(@:.html=3D.htp); exit 1; \ - fi -$(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=3D"$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINP= UTS" \ - $(DVIPS) $(AM_V_texinfo) -o $@ $< - -uninstall-dvi-am: - @$(NORMAL_UNINSTALL) - @list=3D'$(DVIS)'; test -n "$(dvidir)" || list=3D; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ - rm -f "$(DESTDIR)$(dvidir)/$$f"; \ - done - -uninstall-html-am: - @$(NORMAL_UNINSTALL) - @list=3D'$(HTMLS)'; test -n "$(htmldir)" || list=3D; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ - rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ - done - -uninstall-info-am: - @$(PRE_UNINSTALL) - @if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \ - list=3D'$(INFO_DEPS)'; \ - for file in $$list; do \ - relfile=3D`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir=3D'$(DESTDIR)$(infodir)' --remove '$(D= ESTDIR)$(infodir)/$$relfile'"; \ - if install-info --info-dir=3D"$(DESTDIR)$(infodir)" --remove "$(DESTD= IR)$(infodir)/$$relfile"; \ - then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi= ; \ - done; \ - else :; fi - @$(NORMAL_UNINSTALL) - @list=3D'$(INFO_DEPS)'; \ - for file in $$list; do \ - relfile=3D`echo "$$file" | sed 's|^.*/||'`; \ - relfile_i=3D`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ - (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ - echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] = $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ - rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9= ] $$relfile_i[0-9][0-9]; \ - else :; fi); \ - done - -uninstall-pdf-am: - @$(NORMAL_UNINSTALL) - @list=3D'$(PDFS)'; test -n "$(pdfdir)" || list=3D; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -uninstall-ps-am: - @$(NORMAL_UNINSTALL) - @list=3D'$(PSS)'; test -n "$(psdir)" || list=3D; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ - rm -f "$(DESTDIR)$(psdir)/$$f"; \ - done - -dist-info: $(INFO_DEPS) - @srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list=3D'$(INFO_DEPS)'; \ - for base in $$list; do \ - case $$base in \ - $(srcdir)/*) base=3D`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ - if test -f $$base; then d=3D.; else d=3D$(srcdir); fi; \ - base_i=3D`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ - for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$bas= e_i[0-9] $$d/$$base_i[0-9][0-9]; do \ - if test -f $$file; then \ - relfile=3D`expr "$$file" : "$$d/\(.*\)"`; \ - test -f "$(distdir)/$$relfile" || \ - cp -p $$file "$(distdir)/$$relfile"; \ - else :; fi; \ - done; \ - done - -mostlyclean-aminfo: - -rm -rf libc.t2d libc.t2p - -clean-aminfo: - -test -z "libc.dvi libc.pdf libc.ps libc.html" \ - || rm -rf libc.dvi libc.pdf libc.ps libc.html - -maintainer-clean-aminfo: - @list=3D'$(INFO_DEPS)'; for i in $$list; do \ - i_i=3D`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ - echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ - rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ - done - # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. # To change the values of 'make' variables: instead of editing Makefiles, @@ -928,8 +690,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive =20 -clean-am: clean-aminfo clean-generic clean-libtool \ - clean-noinstLIBRARIES clean-noinstLTLIBRARIES mostlyclean-am +clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ + clean-noinstLTLIBRARIES mostlyclean-am =20 distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -939,175 +701,82 @@ distclean-am: clean-am distclean-compile distclean-g= eneric \ =20 dvi: dvi-recursive =20 -dvi-am: $(DVIS) +dvi-am: =20 html: html-recursive =20 -html-am: $(HTMLS) +html-am: =20 info: info-recursive =20 -info-am: $(INFO_DEPS) +info-am: =20 install-data-am: =20 install-dvi: install-dvi-recursive =20 -install-dvi-am: $(DVIS) - @$(NORMAL_INSTALL) - @list=3D'$(DVIS)'; test -n "$(dvidir)" || list=3D; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ - done +install-dvi-am: + install-exec-am: =20 install-html: install-html-recursive =20 -install-html-am: $(HTMLS) - @$(NORMAL_INSTALL) - @list=3D'$(HTMLS)'; list2=3D; test -n "$(htmldir)" || list=3D; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p" || test -d "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi= ; \ - $(am__strip_dir) \ - d2=3D$$d$$p; \ - if test -d "$$d2"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ - $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ - echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ - $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ - else \ - list2=3D"$$list2 $$d2"; \ - fi; \ - done; \ - test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ - done; } +install-html-am: + install-info: install-info-recursive =20 -install-info-am: $(INFO_DEPS) - @$(NORMAL_INSTALL) - @srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list=3D'$(INFO_DEPS)'; test -n "$(infodir)" || list=3D; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \ - fi; \ - for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=3D`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ - if test -f $$file; then d=3D.; else d=3D$(srcdir); fi; \ - file_i=3D`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ - for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ - $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ - if test -f $$ifile; then \ - echo "$$ifile"; \ - else : ; fi; \ - done; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done - @$(POST_INSTALL) - @if $(am__can_run_installinfo); then \ - list=3D'$(INFO_DEPS)'; test -n "$(infodir)" || list=3D; \ - for file in $$list; do \ - relfile=3D`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir=3D'$(DESTDIR)$(infodir)' '$(DESTDIR)$(= infodir)/$$relfile'";\ - install-info --info-dir=3D"$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir= )/$$relfile" || :;\ - done; \ - else : ; fi +install-info-am: + +install-man: + install-pdf: install-pdf-recursive =20 -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - @list=3D'$(PDFS)'; test -n "$(pdfdir)" || list=3D; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done +install-pdf-am: + install-ps: install-ps-recursive =20 -install-ps-am: $(PSS) - @$(NORMAL_INSTALL) - @list=3D'$(PSS)'; test -n "$(psdir)" || list=3D; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done +install-ps-am: + installcheck-am: =20 maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-aminfo \ - maintainer-clean-generic +maintainer-clean-am: distclean-am maintainer-clean-generic =20 mostlyclean: mostlyclean-recursive =20 -mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool =20 pdf: pdf-recursive =20 -pdf-am: $(PDFS) +pdf-am: =20 ps: ps-recursive =20 -ps-am: $(PSS) +ps-am: =20 -uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ - uninstall-pdf-am uninstall-ps-am +uninstall-am: =20 .MAKE: $(am__recursive_targets) install-am install-strip =20 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-aminfo clean-cscope \ - clean-generic clean-libtool clean-noinstLIBRARIES \ - clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \ - dist-info distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ - mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ + cscope cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-dvi-am uninstall-html-am \ - uninstall-info-am uninstall-pdf-am uninstall-ps-am + uninstall-am =20 .PRECIOUS: Makefile =20 @@ -1125,45 +794,11 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uni= nstall-info-am \ =20 $(SUBLIBS): ; @true =20 -libc.info: targetdep.tex $(SUBDEFS) - -libc.dvi: targetdep.tex $(SUBDEFS) - -stmp-targetdep: force - rm -f tmp-targetdep.texi - targetdoc=3D`pwd`/tmp-targetdep.texi; \ - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "." && test "$$d" !=3D "$(LIBC_MACHINE_DIR)"; then \ - (cd $$d && $(MAKE) TARGETDOC=3D$${targetdoc} doc) || exit 1; \ - fi; \ - done - cat $(srcdir)/sys.tex >>tmp-targetdep.texi - $(SHELL) $(newlib_basedir)/../move-if-change tmp-targetdep.texi targetdep= .tex - touch $@ - -targetdep.tex: stmp-targetdep ; @true - -$(SUBDEFS): stmp-targetdep ; @true - -docbook-recursive: force - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "." && test "$$d" !=3D "$(LIBC_MACHINE_DIR)"; 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 +crt0.o: sys/crt0.o + rm -f $@ + ln sys/crt0.o $@ >/dev/null 2>/dev/null || cp sys/crt0.o $@ =20 -.PHONY: force -force: +sys/crt0.o: ; @true =20 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/newlib/libc/Makefile.inc b/newlib/libc/Makefile.inc index afd016b9d..fff9e8805 100644 --- a/newlib/libc/Makefile.inc +++ b/newlib/libc/Makefile.inc @@ -4,6 +4,7 @@ info_TEXINFOS +=3D %D%/libc.texi LIBC_CHEWOUT_FILES =3D =20 LIBC_CHAPTERS =3D %D%/sys.tex +LIBC_DOCBOOK_OUT_FILES =3D $(LIBC_CHEWOUT_FILES:.def=3D.xml) =20 %D%/libc.dvi: %D%/targetdep.tex $(LIBC_CHEWOUT_FILES) =20 @@ -13,6 +14,25 @@ LIBC_CHAPTERS =3D %D%/sys.tex $(AM_V_at)touch $@ %D%/targetdep.tex: %D%/targetdep.tex.stamp; @true =20 +%D%/libc.xml.stamp: %D%/libc.in.xml $(LIBC_CHAPTERS) $(LIBC_DOCBOOK_OUT_FI= LES) + $(AM_V_at)\ + for chapter in $(LIBC_CHAPTERS); do \ + $(TEXI2DOCBOOK) < $(srcdir)/$$chapter > %D%/`basename $${chapter%.tex}`= .xml || exit 1; \ + done + $(AM_V_GEN)xsltproc --xinclude --path $(builddir)/%D% --nonet $(srcdir)/r= efcontainers.xslt $< > $@.tmp + $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $(@:.stamp= =3D) + $(AM_V_at)touch $@ +%D%/libc.xml: %D%/libc.xml.stamp; @true + +%C%_man: %D%/libc.xml + $(AM_V_GEN)xmlto --skip-validation -o %D% --searchpath $(builddir)/%D% ma= n -m $(srcdir)/man.xsl %D%/libc.xml +man: %C%_man + +%C%_install-man: %C%_man + $(MKDIR_P) $(DESTDIR)$(mandir)/man3 + $(INSTALL_DATA) %D%/*.3 $(DESTDIR)$(mandir)/man3/ +install-man: %C%_install-man + include %D%/ctype/Makefile.inc include %D%/iconv/Makefile.inc include %D%/locale/Makefile.inc @@ -31,4 +51,6 @@ include %D%/time/Makefile.inc CLEANFILES +=3D \ %D%/targetdep.tex \ %D%/targetdep.tex.stamp \ - $(LIBC_CHEWOUT_FILES) + $(LIBC_CHEWOUT_FILES) \ + $(LIBC_DOCBOOK_OUT_FILES) \ + %D%/*.xml %D%/*.xml.stamp %D%/*.3 diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am index e074e4d7f..4c4c36db1 100644 --- a/newlib/libc/ctype/Makefile.am +++ b/newlib/libc/ctype/Makefile.am @@ -95,10 +95,4 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) - $(lpfx)ctype_.$(oext): ctype_.c ctype_iso.h ctype_cp.h diff --git a/newlib/libc/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in index df7dfab77..a6f6510fd 100644 --- a/newlib/libc/ctype/Makefile.in +++ b/newlib/libc/ctype/Makefile.in @@ -514,22 +514,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D isalnum.def isalpha.def isascii.def isblank.def \ - iscntrl.def isdigit.def islower.def isprint.def ispunct.def \ - isspace.def isupper.def iswalnum.def iswalpha.def iswblank.def \ - iswcntrl.def iswctype.def iswdigit.def iswgraph.def \ - iswlower.def iswprint.def iswpunct.def iswspace.def \ - iswupper.def iswxdigit.def isxdigit.def toascii.def \ - tolower.def toupper.def towctrans.def towlower.def \ - towupper.def wctrans.def wctype.def -LIBC_CHAPTERS =3D ctype.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -549,7 +538,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/iconv/Makefile.am b/newlib/libc/iconv/Makefile.am index 835709861..d9c0d4077 100644 --- a/newlib/libc/iconv/Makefile.am +++ b/newlib/libc/iconv/Makefile.am @@ -7,9 +7,3 @@ cct_DATA=3Dencoding.aliases AM_CPPFLAGS =3D $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) =20 include $(srcdir)/../../Makefile.shared - -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) diff --git a/newlib/libc/iconv/Makefile.in b/newlib/libc/iconv/Makefile.in index 3fc3c82e4..08a2ece9a 100644 --- a/newlib/libc/iconv/Makefile.in +++ b/newlib/libc/iconv/Makefile.in @@ -349,15 +349,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D lib/iconv.def -LIBC_CHAPTERS =3D iconv.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-recursive =20 .SUFFIXES: .SUFFIXES: .def .xml .c -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(srcdir)/lib/Makefile.i= nc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -377,7 +373,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(srcdir)/lib/Mak= efile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/locale/Makefile.am b/newlib/libc/locale/Makefile.am index 3055d0ceb..c060496cf 100644 --- a/newlib/libc/locale/Makefile.am +++ b/newlib/libc/locale/Makefile.am @@ -35,9 +35,3 @@ noinst_DATA =3D endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared - -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) diff --git a/newlib/libc/locale/Makefile.in b/newlib/libc/locale/Makefile.in index 708c4d550..44192a9bf 100644 --- a/newlib/libc/locale/Makefile.in +++ b/newlib/libc/locale/Makefile.in @@ -385,16 +385,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D duplocale.def freelocale.def locale.def \ - newlocale.def uselocale.def -LIBC_CHAPTERS =3D locale.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -414,7 +409,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/misc/Makefile.am b/newlib/libc/misc/Makefile.am index 6d9fefaec..f8f8bb15a 100644 --- a/newlib/libc/misc/Makefile.am +++ b/newlib/libc/misc/Makefile.am @@ -23,9 +23,3 @@ noinst_DATA =3D endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared - -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) diff --git a/newlib/libc/misc/Makefile.in b/newlib/libc/misc/Makefile.in index 02d6c2588..a634f2dc8 100644 --- a/newlib/libc/misc/Makefile.in +++ b/newlib/libc/misc/Makefile.in @@ -365,15 +365,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D ffs.def lock.def unctrl.def -LIBC_CHAPTERS =3D misc.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -393,7 +389,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/posix/Makefile.am b/newlib/libc/posix/Makefile.am index 984ae7fb5..4f4c12d8a 100644 --- a/newlib/libc/posix/Makefile.am +++ b/newlib/libc/posix/Makefile.am @@ -49,10 +49,4 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) - AM_CFLAGS =3D -D_GNU_SOURCE diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in index 3b7612a0d..1e45f832f 100644 --- a/newlib/libc/posix/Makefile.in +++ b/newlib/libc/posix/Makefile.in @@ -416,16 +416,12 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D popen.def posix_spawn.def -LIBC_CHAPTERS =3D posix.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) AM_CFLAGS =3D -D_GNU_SOURCE all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -445,7 +441,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am index dad7efdbe..bf0c8d7f6 100644 --- a/newlib/libc/reent/Makefile.am +++ b/newlib/libc/reent/Makefile.am @@ -61,10 +61,4 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) - $(lpfx)impure.$(oext): $(srcdir)/impure.c $(srcdir)/../include/sys/reent.h diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in index 5317ea169..eac3120db 100644 --- a/newlib/libc/reent/Makefile.in +++ b/newlib/libc/reent/Makefile.in @@ -424,19 +424,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D closer.def reent.def execr.def fcntlr.def \ - fstatr.def gettimeofdayr.def linkr.def lseekr.def mkdirr.def \ - openr.def readr.def renamer.def signalr.def sbrkr.def \ - statr.def timesr.def unlinkr.def fstat64r.def lseek64r.def \ - stat64r.def open64r.def writer.def -LIBC_CHAPTERS =3D reent.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -456,7 +448,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/search/Makefile.am b/newlib/libc/search/Makefile.am index eedb2bad6..c64f28931 100644 --- a/newlib/libc/search/Makefile.am +++ b/newlib/libc/search/Makefile.am @@ -62,9 +62,3 @@ noinst_DATA =3D endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared - -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) diff --git a/newlib/libc/search/Makefile.in b/newlib/libc/search/Makefile.in index 1d564d927..95f62621f 100644 --- a/newlib/libc/search/Makefile.in +++ b/newlib/libc/search/Makefile.in @@ -411,15 +411,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D bsearch.def qsort.def qsort_r.def -LIBC_CHAPTERS =3D=20 -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -439,7 +435,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/signal/Makefile.am b/newlib/libc/signal/Makefile.am index fdcd17d7e..d631662be 100644 --- a/newlib/libc/signal/Makefile.am +++ b/newlib/libc/signal/Makefile.am @@ -18,9 +18,3 @@ noinst_DATA =3D endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared - -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) diff --git a/newlib/libc/signal/Makefile.in b/newlib/libc/signal/Makefile.in index 9ffdce6db..3e554f7bf 100644 --- a/newlib/libc/signal/Makefile.in +++ b/newlib/libc/signal/Makefile.in @@ -357,15 +357,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D psignal.def raise.def signal.def sig2str.def -LIBC_CHAPTERS =3D signal.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -385,7 +381,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/ssp/Makefile.am b/newlib/libc/ssp/Makefile.am index da5573202..2ff5fa0bf 100644 --- a/newlib/libc/ssp/Makefile.am +++ b/newlib/libc/ssp/Makefile.am @@ -62,9 +62,3 @@ noinst_DATA =3D endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared - -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) diff --git a/newlib/libc/ssp/Makefile.in b/newlib/libc/ssp/Makefile.in index 3f539958c..f7fea3df1 100644 --- a/newlib/libc/ssp/Makefile.in +++ b/newlib/libc/ssp/Makefile.in @@ -408,15 +408,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D ssp.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -436,7 +432,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am index c8d5f010f..f1fd89f36 100644 --- a/newlib/libc/stdio/Makefile.am +++ b/newlib/libc/stdio/Makefile.am @@ -241,12 +241,6 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) - # Though small footprint nano-formatted-IO implementation is used # when NEWLIB_NANO_FORMATTED_IO is enabled, we keep all rules for # the other implementation of formatted IO including all i-family diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in index 43ec1dce7..359952ec2 100644 --- a/newlib/libc/stdio/Makefile.in +++ b/newlib/libc/stdio/Makefile.in @@ -744,31 +744,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D clearerr.def diprintf.def dprintf.def \ - fcloseall.def fclose.def fdopen.def feof.def ferror.def \ - fflush.def fgetc.def fgetpos.def fgets.def fgetwc.def \ - fgetws.def fileno.def fmemopen.def fopen.def fopencookie.def \ - fpurge.def fputc.def fputs.def fputwc.def fputws.def fread.def \ - freopen.def fseek.def fsetlocking.def fsetpos.def ftell.def \ - funopen.def fwide.def fwrite.def getc.def getc_u.def \ - getchar.def getchar_u.def getdelim.def getline.def gets.def \ - getw.def getwchar.def mktemp.def nano-vfprintf.def \ - nano-vfscanf.def open_memstream.def perror.def putc.def \ - putc_u.def putchar.def putchar_u.def puts.def putw.def \ - putwchar.def remove.def rename.def rewind.def setbuf.def \ - setbuffer.def setlinebuf.def setvbuf.def siprintf.def \ - siscanf.def sprintf.def sscanf.def stdio_ext.def swprintf.def \ - swscanf.def tmpfile.def tmpnam.def ungetc.def ungetwc.def \ - vfprintf.def vfscanf.def vfwprintf.def vfwscanf.def \ - viprintf.def viscanf.def -LIBC_CHAPTERS =3D stdio.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -788,7 +768,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/stdio64/Makefile.am b/newlib/libc/stdio64/Makefile= .am index 56ddbe31f..3d479d7fa 100644 --- a/newlib/libc/stdio64/Makefile.am +++ b/newlib/libc/stdio64/Makefile.am @@ -38,10 +38,4 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) - AM_CFLAGS =3D -I $(srcdir)/../stdio diff --git a/newlib/libc/stdio64/Makefile.in b/newlib/libc/stdio64/Makefile= .in index 31bd0f2b3..0dcf9e209 100644 --- a/newlib/libc/stdio64/Makefile.in +++ b/newlib/libc/stdio64/Makefile.in @@ -387,18 +387,12 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D fdopen64.def fgetpos64.def fopen64.def \ - freopen64.def fseeko64.def fsetpos64.def ftello64.def \ - tmpfile64.def -LIBC_CHAPTERS =3D stdio64.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) AM_CFLAGS =3D -I $(srcdir)/../stdio all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -418,7 +412,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am index b88aee40b..75fb52f50 100644 --- a/newlib/libc/stdlib/Makefile.am +++ b/newlib/libc/stdlib/Makefile.am @@ -222,12 +222,6 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) - MALLOC_COMPILE =3D $(LIB_COMPILE) -DINTERNAL_NEWLIB =20 $(lpfx)$(MALLOCR).$(oext): $(MALLOCR).c diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in index e3bb0d061..50f909565 100644 --- a/newlib/libc/stdlib/Makefile.in +++ b/newlib/libc/stdlib/Makefile.in @@ -597,25 +597,12 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D _Exit.def a64l.def abort.def abs.def assert.def \ - atexit.def atof.def atoi.def atoll.def calloc.def div.def \ - ecvtbuf.def efgcvt.def envlock.def exit.def getenv.def \ - itoa.def labs.def ldiv.def llabs.def lldiv.def malloc.def \ - mblen.def mbsnrtowcs.def mbstowcs.def mbtowc.def mlock.def \ - mstats.def on_exit.def rand.def rand48.def random.def \ - rpmatch.def strtod.def strtol.def strtoll.def strtoul.def \ - strtoull.def utoa.def wcsnrtombs.def wcstod.def wcstol.def \ - wcstoll.def wcstoul.def wcstoull.def system.def wcstombs.def \ - wctomb.def -LIBC_CHAPTERS =3D stdlib.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) MALLOC_COMPILE =3D $(LIB_COMPILE) -DINTERNAL_NEWLIB all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -635,7 +622,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am index d85a51365..ac41665bb 100644 --- a/newlib/libc/string/Makefile.am +++ b/newlib/libc/string/Makefile.am @@ -143,9 +143,3 @@ noinst_DATA =3D endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared - -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in index cad0b4ac5..1ab8760aa 100644 --- a/newlib/libc/string/Makefile.in +++ b/newlib/libc/string/Makefile.in @@ -572,33 +572,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBC_CHEWOUT_FILES =3D bcmp.def memcpy.def strcmp.def strncat.def \ - strstr.def bcopy.def memmove.def strcoll.def strncmp.def \ - strtok.def bzero.def memset.def strcpy.def strncpy.def \ - strxfrm.def index.def rindex.def strcspn.def strpbrk.def \ - swab.def memchr.def strcat.def strerror.def strerror_r.def \ - strrchr.def memcmp.def strchr.def strlen.def strnlen.def \ - strspn.def strcasecmp.def strncasecmp.def strcasestr.def \ - strlwr.def strupr.def memccpy.def mempcpy.def stpcpy.def \ - stpncpy.def strsignal.def wcscasecmp.def wcscat.def wcschr.def \ - wcscmp.def wcscoll.def wcscpy.def wcscspn.def wcpcpy.def \ - wcpncpy.def wcsdup.def wcslcat.def wcslcpy.def wcslen.def \ - wcsncasecmp.def wcsncat.def wcsncmp.def wcsncpy.def \ - wcsnlen.def wcspbrk.def wcsrchr.def wcsspn.def wcsstr.def \ - wcstok.def wcswidth.def wcsxfrm.def wcwidth.def wmemchr.def \ - wmemcmp.def wmemcpy.def wmemmove.def wmemset.def memmem.def \ - memrchr.def rawmemchr.def strchrnul.def strcasecmp_l.def \ - strcoll_l.def strncasecmp_l.def strxfrm_l.def wcscasecmp_l.def \ - wcscoll_l.def wcsncasecmp_l.def wcsxfrm_l.def strverscmp.def \ - strnstr.def wmempcpy.def -LIBC_CHAPTERS =3D strings.tex wcstrings.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -618,7 +596,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libc/time/Makefile.am b/newlib/libc/time/Makefile.am index e9dcee44c..a2a807917 100644 --- a/newlib/libc/time/Makefile.am +++ b/newlib/libc/time/Makefile.am @@ -42,10 +42,4 @@ endif # USE_LIBTOOL # This rule is needed so that wcsftime.o is rebuilt when strftime.c change= s. include $(srcdir)/../../Makefile.shared =20 -LIBC_CHEWOUT_FILES =3D -LIBC_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) - $(lpfx)wcsftime.$(oext): strftime.c diff --git a/newlib/libc/time/Makefile.in b/newlib/libc/time/Makefile.in index ac787d98f..ca66ef67d 100644 --- a/newlib/libc/time/Makefile.in +++ b/newlib/libc/time/Makefile.in @@ -393,19 +393,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) - -# This rule is needed so that wcsftime.o is rebuilt when strftime.c change= s. -LIBC_CHEWOUT_FILES =3D asctime.def clock.def ctime.def difftime.def \ - gmtime.def lcltime.def mktime.def strftime.def time.def \ - tzlock.def tzset.def wcsftime.def -LIBC_CHAPTERS =3D time.tex -CHEWOUT_FILES =3D $(LIBC_CHEWOUT_FILES) -CHAPTERS =3D $(LIBC_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -425,7 +417,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -813,6 +805,8 @@ docbook: $(DOCBOOK_OUT_FILES) ${top_srcdir}/../doc/chapter-texi2docbook.py <$(srcdir)/$${chapter%.xml= }.tex >../$$chapter ; \ done =20 +# This rule is needed so that wcsftime.o is rebuilt when strftime.c change= s. + $(lpfx)wcsftime.$(oext): strftime.c =20 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am index 1070af011..6ea7ec04f 100644 --- a/newlib/libm/Makefile.am +++ b/newlib/libm/Makefile.am @@ -36,27 +36,5 @@ endif =20 $(SUBLIBS): =20 -docbook-recursive: force - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ - (cd $$d && $(MAKE) docbook) || exit 1; \ - fi; \ - done - -math/stmp-xml complex/stmp-xml: docbook-recursive - -man: math/stmp-xml complex/stmp-xml libm.in.xml - xsltproc --xinclude --path ${builddir} --nonet ${srcdir}/../refcontainers= .xslt ${srcdir}/libm.in.xml >libm.xml - xmlto --skip-validation --searchpath ${builddir} man -m ${srcdir}/../man.= xsl libm.xml - -install-man: man - mkdir -p $(DESTDIR)$(mandir)/man3 - $(INSTALL_DATA) *.3 $(DESTDIR)$(mandir)/man3/ - -.PHONY: force -force: - -CLEANFILES =3D *.xml *.3 - ACLOCAL_AMFLAGS =3D -I .. -I ../.. -I ../../config CONFIG_STATUS_DEPENDENCIES =3D $(newlib_basedir)/configure.host diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in index 0fdbd04a9..3f52e8c55 100644 --- a/newlib/libm/Makefile.in +++ b/newlib/libm/Makefile.in @@ -359,7 +359,6 @@ libm_la_LDFLAGS =3D -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@libm_la_SOURCES =3D=20 @USE_LIBTOOL_TRUE@libm_la_LIBADD =3D $(SUBLIBS) @USE_LIBTOOL_FALSE@noinst_LIBRARIES =3D libm.a -CLEANFILES =3D *.xml *.3 ACLOCAL_AMFLAGS =3D -I .. -I ../.. -I ../../config CONFIG_STATUS_DEPENDENCIES =3D $(newlib_basedir)/configure.host all: all-recursive @@ -578,7 +577,6 @@ install-strip: mostlyclean-generic: =20 clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) =20 distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,6 +624,8 @@ install-info: install-info-recursive =20 install-info-am: =20 +install-man: + install-pdf: install-pdf-recursive =20 install-pdf-am: @@ -691,26 +691,6 @@ uninstall-am: =20 $(SUBLIBS): =20 -docbook-recursive: force - for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ - (cd $$d && $(MAKE) docbook) || exit 1; \ - fi; \ - done - -math/stmp-xml complex/stmp-xml: docbook-recursive - -man: math/stmp-xml complex/stmp-xml libm.in.xml - xsltproc --xinclude --path ${builddir} --nonet ${srcdir}/../refcontainers= .xslt ${srcdir}/libm.in.xml >libm.xml - xmlto --skip-validation --searchpath ${builddir} man -m ${srcdir}/../man.= xsl libm.xml - -install-man: man - mkdir -p $(DESTDIR)$(mandir)/man3 - $(INSTALL_DATA) *.3 $(DESTDIR)$(mandir)/man3/ - -.PHONY: force -force: - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/newlib/libm/Makefile.inc b/newlib/libm/Makefile.inc index 39418cc79..f2f192ea8 100644 --- a/newlib/libm/Makefile.inc +++ b/newlib/libm/Makefile.inc @@ -4,6 +4,7 @@ info_TEXINFOS +=3D %D%/libm.texi LIBM_CHEWOUT_FILES =3D =20 LIBM_CHAPTERS =3D +LIBM_DOCBOOK_OUT_FILES =3D $(LIBM_CHEWOUT_FILES:.def=3D.xml) =20 %D%/libm.dvi: %D%/targetdep.tex $(LIBM_CHEWOUT_FILES) =20 @@ -13,6 +14,25 @@ LIBM_CHAPTERS =3D $(AM_V_at)touch $@ %D%/targetdep.tex: %D%/targetdep.tex.stamp; @true =20 +%D%/libm.xml.stamp: %D%/libm.in.xml $(LIBM_CHAPTERS) $(LIBM_DOCBOOK_OUT_FI= LES) + $(AM_V_at)\ + for chapter in $(LIBM_CHAPTERS); do \ + $(TEXI2DOCBOOK) < $(srcdir)/$$chapter > %D%/`basename $${chapter%.tex}`= .xml || exit 1; \ + done + $(AM_V_GEN)xsltproc --xinclude --path $(builddir)/%D% --nonet $(srcdir)/r= efcontainers.xslt $< > $@.tmp + $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $(@:.stamp= =3D) + $(AM_V_at)touch $@ +%D%/libm.xml: %D%/libm.xml.stamp; @true + +%C%_man: %D%/libm.xml + $(AM_V_GEN)xmlto --skip-validation -o %D% --searchpath $(builddir)/%D% ma= n -m $(srcdir)/man.xsl %D%/libm.xml +man: %C%_man + +%C%_install-man: %C%_man + $(MKDIR_P) $(DESTDIR)$(mandir)/man3 + $(INSTALL_DATA) %D%/*.3 $(DESTDIR)$(mandir)/man3/ +install-man: %C%_install-man + include %D%/common/Makefile.inc include %D%/complex/Makefile.inc include %D%/fenv/Makefile.inc @@ -25,4 +45,6 @@ endif CLEANFILES +=3D \ %D%/targetdep.tex \ %D%/targetdep.tex.stamp \ - $(LIBM_CHEWOUT_FILES) + $(LIBM_CHEWOUT_FILES) \ + $(LIBM_DOCBOOK_OUT_FILES) \ + %D%/*.xml %D%/*.xml.stamp %D%/*.3 diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am index 29597d603..325f4717d 100644 --- a/newlib/libm/common/Makefile.am +++ b/newlib/libm/common/Makefile.am @@ -59,12 +59,6 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBM_CHEWOUT_FILES =3D -LIBM_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) - # A partial dependency list. =20 $(lib_a_OBJECTS): $(srcdir)/../../libc/include/math.h fdlibm.h diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in index b737661dd..1e9ca566d 100644 --- a/newlib/libm/common/Makefile.in +++ b/newlib/libm/common/Makefile.in @@ -493,20 +493,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES =3D s_cbrt.def s_copysign.def s_exp10.def s_expm1.def \ - s_ilogb.def s_infinity.def s_isnan.def s_log1p.def s_modf.def \ - s_nan.def s_nextafter.def s_pow10.def s_scalbn.def s_fdim.def \ - s_fma.def s_fmax.def s_fmin.def s_logb.def s_log2.def \ - s_lrint.def s_lround.def s_nearbyint.def s_remquo.def \ - s_rint.def s_round.def s_signbit.def s_trunc.def isgreater.def -LIBM_CHAPTERS =3D -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -526,7 +517,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libm/complex/Makefile.am b/newlib/libm/complex/Makefile= .am index 0f27fff19..aceb55e9f 100644 --- a/newlib/libm/complex/Makefile.am +++ b/newlib/libm/complex/Makefile.am @@ -35,12 +35,6 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBM_CHEWOUT_FILES =3D -LIBM_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) - # A partial dependency list. =20 $(lib_a_OBJECTS): $(srcdir)/../../libc/include/complex.h $(srcdir)/cephes_= subr.h $(srcdir)/cephes_subrf.h $(srcdir)/cephes_subrl.h diff --git a/newlib/libm/complex/Makefile.in b/newlib/libm/complex/Makefile= .in index 4c4c84ebb..5c83445a0 100644 --- a/newlib/libm/complex/Makefile.in +++ b/newlib/libm/complex/Makefile.in @@ -408,18 +408,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES =3D cabs.def cacos.def cacosh.def carg.def casin.def \ - casinh.def catan.def catanh.def ccos.def ccosh.def cexp.def \ - cimag.def clog.def clog10.def conj.def cpow.def cproj.def \ - creal.def csin.def csinh.def csqrt.def ctan.def ctanh.def -LIBM_CHAPTERS =3D complex.tex -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -439,7 +432,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libm/fenv/Makefile.am b/newlib/libm/fenv/Makefile.am index 00c55d038..d515192c0 100644 --- a/newlib/libm/fenv/Makefile.am +++ b/newlib/libm/fenv/Makefile.am @@ -22,12 +22,6 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBM_CHEWOUT_FILES =3D -LIBM_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) - # A partial dependency list. =20 $(lib_a_OBJECTS): $(srcdir)/../../libc/include/fenv.h diff --git a/newlib/libm/fenv/Makefile.in b/newlib/libm/fenv/Makefile.in index bba22c73e..dab645f2b 100644 --- a/newlib/libm/fenv/Makefile.in +++ b/newlib/libm/fenv/Makefile.in @@ -355,18 +355,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES =3D feclearexcept.def fegetenv.def \ - fegetexceptflag.def fegetround.def feholdexcept.def \ - feraiseexcept.def fesetenv.def fesetexceptflag.def \ - fesetround.def fetestexcept.def feupdateenv.def -LIBM_CHAPTERS =3D fenv.tex -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -386,7 +379,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am index 3d23a46a1..3402090aa 100644 --- a/newlib/libm/math/Makefile.am +++ b/newlib/libm/math/Makefile.am @@ -66,12 +66,6 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBM_CHEWOUT_FILES =3D -LIBM_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) - # A partial dependency list. =20 $(lib_a_OBJECTS): $(srcdir)/../../libc/include/math.h $(srcdir)/../common/= fdlibm.h diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in index f0246e0e7..0d906b8d4 100644 --- a/newlib/libm/math/Makefile.in +++ b/newlib/libm/math/Makefile.in @@ -484,20 +484,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES =3D w_acos.def w_acosh.def w_asin.def s_asinh.def \ - s_atan.def w_atan2.def w_atanh.def w_j0.def w_cosh.def \ - s_erf.def w_exp.def w_exp2.def s_fabs.def s_floor.def \ - w_fmod.def s_frexp.def w_gamma.def w_hypot.def s_ldexp.def \ - w_log.def w_log10.def w_pow.def w_remainder.def s_sin.def \ - w_sinh.def w_sqrt.def s_tan.def s_tanh.def -LIBM_CHAPTERS =3D math.tex -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -517,7 +508,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am index 44d0e8f28..3f4bd75d3 100644 --- a/newlib/libm/mathfp/Makefile.am +++ b/newlib/libm/mathfp/Makefile.am @@ -56,12 +56,6 @@ endif # USE_LIBTOOL =20 include $(srcdir)/../../Makefile.shared =20 -LIBM_CHEWOUT_FILES =3D -LIBM_CHAPTERS =3D -include ./Makefile.inc -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) - # A partial dependency list. =20 $(lib_a_OBJECTS): $(srcdir)/../../libc/include/math.h $(srcdir)/../common/= fdlibm.h diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in index 3f6eb92fa..ded5cc5b3 100644 --- a/newlib/libm/mathfp/Makefile.in +++ b/newlib/libm/mathfp/Makefile.in @@ -447,21 +447,11 @@ DOCBOOK_CHEW =3D ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES =3D $(CHEWOUT_FILES:.def=3D.xml) DOCBOOK_CHAPTERS =3D $(CHAPTERS:.tex=3D.xml) CLEANFILES =3D $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES =3D e_acosh.def e_atanh.def e_hypot.def \ - e_remainder.def er_lgamma.def s_acos.def s_asine.def \ - s_asinh.def s_atan.def s_atan2.def s_atangent.def s_cosh.def \ - s_erf.def s_exp.def s_fabs.def s_floor.def s_fmod.def \ - s_frexp.def s_ldexp.def s_log10.def s_logarithm.def s_pow.def \ - s_sine.def s_sineh.def s_sqrt.def s_tan.def s_tanh.def \ - w_jn.def -LIBM_CHAPTERS =3D mathfp.tex -CHEWOUT_FILES =3D $(LIBM_CHEWOUT_FILES) -CHAPTERS =3D $(LIBM_CHAPTERS) all: all-am =20 .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcd= ir)/../../Makefile.shared $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -481,7 +471,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(= am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__dep= files_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh