From 6026ef29d8c847716a745bb6e11aa1d2c36a2b64 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 21 Jan 2022 22:50:42 -0500 Subject: newlib: move man page generation into top-level build This allows building the libc & libm pages in parallel, and drops the duplication in the subdirs with the chew/chapter settings. The unused rules in Makefile.shared are left in place to minimize noise in the change. --- 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 ++------------ 13 files changed, 35 insertions(+), 127 deletions(-) (limited to 'newlib/libm') diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am index 1070af0..6ea7ec0 100644 --- a/newlib/libm/Makefile.am +++ b/newlib/libm/Makefile.am @@ -36,27 +36,5 @@ endif $(SUBLIBS): -docbook-recursive: force - for d in $(SUBDIRS); do \ - if test "$$d" != "."; 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 = *.xml *.3 - ACLOCAL_AMFLAGS = -I .. -I ../.. -I ../../config CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in index 0fdbd04..3f52e8c 100644 --- a/newlib/libm/Makefile.in +++ b/newlib/libm/Makefile.in @@ -359,7 +359,6 @@ libm_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@libm_la_SOURCES = @USE_LIBTOOL_TRUE@libm_la_LIBADD = $(SUBLIBS) @USE_LIBTOOL_FALSE@noinst_LIBRARIES = libm.a -CLEANFILES = *.xml *.3 ACLOCAL_AMFLAGS = -I .. -I ../.. -I ../../config CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host all: all-recursive @@ -578,7 +577,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,6 +624,8 @@ install-info: install-info-recursive install-info-am: +install-man: + install-pdf: install-pdf-recursive install-pdf-am: @@ -691,26 +691,6 @@ uninstall-am: $(SUBLIBS): -docbook-recursive: force - for d in $(SUBDIRS); do \ - if test "$$d" != "."; 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 39418cc..f2f192e 100644 --- a/newlib/libm/Makefile.inc +++ b/newlib/libm/Makefile.inc @@ -4,6 +4,7 @@ info_TEXINFOS += %D%/libm.texi LIBM_CHEWOUT_FILES = LIBM_CHAPTERS = +LIBM_DOCBOOK_OUT_FILES = $(LIBM_CHEWOUT_FILES:.def=.xml) %D%/libm.dvi: %D%/targetdep.tex $(LIBM_CHEWOUT_FILES) @@ -13,6 +14,25 @@ LIBM_CHAPTERS = $(AM_V_at)touch $@ %D%/targetdep.tex: %D%/targetdep.tex.stamp; @true +%D%/libm.xml.stamp: %D%/libm.in.xml $(LIBM_CHAPTERS) $(LIBM_DOCBOOK_OUT_FILES) + $(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)/refcontainers.xslt $< > $@.tmp + $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $(@:.stamp=) + $(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% man -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 += \ %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 29597d6..325f471 100644 --- a/newlib/libm/common/Makefile.am +++ b/newlib/libm/common/Makefile.am @@ -59,12 +59,6 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -LIBM_CHEWOUT_FILES = -LIBM_CHAPTERS = -include ./Makefile.inc -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) - # A partial dependency list. $(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 b737661..1e9ca56 100644 --- a/newlib/libm/common/Makefile.in +++ b/newlib/libm/common/Makefile.in @@ -493,20 +493,11 @@ DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml) DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml) CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES = 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 = -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) all: all-am .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../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__depfiles_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libm/complex/Makefile.am b/newlib/libm/complex/Makefile.am index 0f27fff..aceb55e 100644 --- a/newlib/libm/complex/Makefile.am +++ b/newlib/libm/complex/Makefile.am @@ -35,12 +35,6 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -LIBM_CHEWOUT_FILES = -LIBM_CHAPTERS = -include ./Makefile.inc -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) - # A partial dependency list. $(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 4c4c84e..5c83445 100644 --- a/newlib/libm/complex/Makefile.in +++ b/newlib/libm/complex/Makefile.in @@ -408,18 +408,11 @@ DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml) DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml) CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES = 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 = complex.tex -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) all: all-am .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../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__depfiles_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libm/fenv/Makefile.am b/newlib/libm/fenv/Makefile.am index 00c55d0..d515192 100644 --- a/newlib/libm/fenv/Makefile.am +++ b/newlib/libm/fenv/Makefile.am @@ -22,12 +22,6 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -LIBM_CHEWOUT_FILES = -LIBM_CHAPTERS = -include ./Makefile.inc -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) - # A partial dependency list. $(lib_a_OBJECTS): $(srcdir)/../../libc/include/fenv.h diff --git a/newlib/libm/fenv/Makefile.in b/newlib/libm/fenv/Makefile.in index bba22c7..dab645f 100644 --- a/newlib/libm/fenv/Makefile.in +++ b/newlib/libm/fenv/Makefile.in @@ -355,18 +355,11 @@ DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml) DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml) CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES = feclearexcept.def fegetenv.def \ - fegetexceptflag.def fegetround.def feholdexcept.def \ - feraiseexcept.def fesetenv.def fesetexceptflag.def \ - fesetround.def fetestexcept.def feupdateenv.def -LIBM_CHAPTERS = fenv.tex -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) all: all-am .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../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__depfiles_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am index 3d23a46..3402090 100644 --- a/newlib/libm/math/Makefile.am +++ b/newlib/libm/math/Makefile.am @@ -66,12 +66,6 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -LIBM_CHEWOUT_FILES = -LIBM_CHAPTERS = -include ./Makefile.inc -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) - # A partial dependency list. $(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 f0246e0..0d906b8 100644 --- a/newlib/libm/math/Makefile.in +++ b/newlib/libm/math/Makefile.in @@ -484,20 +484,11 @@ DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml) DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml) CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES = 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 = math.tex -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) all: all-am .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../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__depfiles_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am index 44d0e8f..3f4bd75 100644 --- a/newlib/libm/mathfp/Makefile.am +++ b/newlib/libm/mathfp/Makefile.am @@ -56,12 +56,6 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -LIBM_CHEWOUT_FILES = -LIBM_CHAPTERS = -include ./Makefile.inc -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) - # A partial dependency list. $(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 3f6eb92..ded5cc5 100644 --- a/newlib/libm/mathfp/Makefile.in +++ b/newlib/libm/mathfp/Makefile.in @@ -447,21 +447,11 @@ DOCBOOK_CHEW = ${top_srcdir}/../doc/makedocbook.py DOCBOOK_OUT_FILES = $(CHEWOUT_FILES:.def=.xml) DOCBOOK_CHAPTERS = $(CHAPTERS:.tex=.xml) CLEANFILES = $(CHEWOUT_FILES) $(DOCBOOK_OUT_FILES) -LIBM_CHEWOUT_FILES = 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 = mathfp.tex -CHEWOUT_FILES = $(LIBM_CHEWOUT_FILES) -CHAPTERS = $(LIBM_CHAPTERS) all: all-am .SUFFIXES: .SUFFIXES: .def .xml .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../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__depfiles_maybe);; \ esac; -$(srcdir)/../../Makefile.shared $(srcdir)/./Makefile.inc $(am__empty): +$(srcdir)/../../Makefile.shared $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- cgit v1.1