From 110c96ff292adf9c5be51a8a22ee8ff8e1af3959 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 4 May 2012 17:09:56 +0200 Subject: [PATCH] Revert "Do not build manual in the source directory" This reverts commit e3945c47bdac1149a1fec5d46bd567a248cd17b9. reverting since it breaks building. --- ChangeLog | 31 +------------- NEWS | 12 +++--- manual/.gitignore | 30 +++++++++++++ manual/Makefile | 111 ++++++++++++++++++++++--------------------------- manual/libc-texinfo.sh | 19 ++++----- 5 files changed, 94 insertions(+), 109 deletions(-) create mode 100644 manual/.gitignore diff --git a/ChangeLog b/ChangeLog index 38ed06c..5fb65d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,33 +1,4 @@ -2012-05-04 Andreas Jaeger - - [BZ #13750] - * manual/.gitignore: Remove, it's not needed anymore. - * manual/libc-texinfo.sh: Pass OUTDIR as extra argument, create - all files in it. - * manual/Makefile (dvi, pdf, info, html): Depend on files in build - directory. - (texis): Renamed to $(objpfx)texis. - (texis-path): New, contains path to generated files. - (chapters.%): Use texis-path for complete path, add extra argument - libc-texinfo.sh. - (libc.dvi, libc.pdf, libc.info, libc.pdf): Add $(objfpx) as prefix. - (libc/index.html, summary.texi): Add $(objpfx) as prefix. - (summary,texi, stamp-summary): Use complete path of - files. Generate files in build dir. - (dir-add.texi): Build in build dir. - (libm-err.texi,stamp-libm-err): Likewise. - (version.texi, stamp-version): Likewise. - (.%c.texi): Likewise. - (%.info,%.dvi,%.pdf): Add $(objpfx) as prefix, build in build dir. - (mostlyclean): Remove target. - (realclean): Remove target. - (generated): Add new variable with contents from mostlyclean and - realclean, remove entries duplicated in common-mostlyclean, add - stamp-libm-err and stamp-version. - (generated-dirs): Add libc directory. - ($(inst_infodir)/libc.info): Install files from build dir. - -2012-05-04 Adhemerval Zanella +2012-05-02 Adhemerval Zanella * sysdeps/ieee754/ldbl-128ibm/e_acosl.c (__ieee754_acosl): Fix long double comparison inaccuracies. diff --git a/NEWS b/NEWS index 2d87df9..0873b2f 100644 --- a/NEWS +++ b/NEWS @@ -18,12 +18,12 @@ Version 2.16 12047, 12340, 13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637, 13656, 13658, 13673, 13691, 13695, 13704, 13705, - 13706, 13726, 13738, 13739, 13750, 13758, 13760, 13761, 13775, 13786, - 13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854, - 13871, 13872, 13873, 13879, 13883, 13886, 13892, 13895, 13908, 13910, - 13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, - 13924, 13926, 13927, 13928, 13938, 13941, 13942, 13963, 13967, 13970, - 13973, 14027, 14033, 14034, 14040, 14049, 14055 + 13706, 13726, 13738, 13739, 13758, 13760, 13761, 13775, 13786, 13792, + 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854, 13871, + 13872, 13873, 13879, 13883, 13886, 13892, 13895, 13908, 13910, 13911, + 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13924, + 13926, 13927, 13928, 13938, 13941, 13942, 13963, 13967, 13970, 13973, + 14027, 14033, 14034, 14040, 14049, 14055 * ISO C11 support: diff --git a/manual/.gitignore b/manual/.gitignore new file mode 100644 index 0000000..55c49c9 --- /dev/null +++ b/manual/.gitignore @@ -0,0 +1,30 @@ +*.aux +*.c.texi +*.cp +*.cps +*.dvi* +*.fn +*.fns +*.info* +*.ky +*.kys +*.log +*.pdf +*.pg +*.pgs +*.ps +*.tmp +*.toc +*.tp +*.tps +*.vr +*.vrs +chapters.texi +dir-add.texi +dir-add.texinfo +libm-err.texi +stamp-* +summary.texi +texis +top-menu.texi +version.texi diff --git a/manual/Makefile b/manual/Makefile index 08afecb..29e36c2 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -26,19 +26,18 @@ INSTALL_INFO = install-info .PHONY: all dvi pdf info html all: dvi +dvi: libc.dvi +pdf: libc.pdf # Get glibc's configuration info. include ../Makeconfig -dvi: $(objpfx)libc.dvi -pdf: $(objpfx)libc.pdf - TEXI2DVI = texi2dvi TEXI2PDF = texi2dvi --pdf ifneq ($(strip $(MAKEINFO)),:) all: info -info: $(objpfx)libc.info +info: libc.info endif mkinstalldirs = $(..)scripts/mkinstalldirs @@ -53,8 +52,8 @@ add-chapters = $(wildcard $(foreach d, $(add-ons), ../$d/$d.texi)) appendices = lang.texi header.texi install.texi maint.texi contrib.texi licenses = freemanuals.texi lgpl-2.1.texi fdl-1.3.texi --include $(objpfx)texis -$(objpfx)texis: texis.awk $(chapters) $(add-chapters) $(appendices) $(licenses) +-include texis +texis: texis.awk $(chapters) $(add-chapters) $(appendices) $(licenses) $(AWK) -f $^ > $@.T mv -f $@.T $@ @@ -62,45 +61,34 @@ nonexamples = $(filter-out $(add-chapters) %.c.texi, $(texis)) examples = $(filter-out $(foreach d, $(add-ons), ../$d/%.c.texi), \ $(filter %.c.texi, $(texis))) -# Generated files directly included from libc.texinfo. -libc-texi-generated = chapters.texi top-menu.texi dir-add.texi \ - libm-err.texi version.texi - -# Add path to build dir for generated files -texis-path := $(filter-out $(libc-texi-generated) summary.texi $(examples), \ - $(texis)) \ - $(addprefix $(objpfx),$(filter $(libc-texi-generated) summary.texi \ - $(examples), $(texis))) - # Kludge: implicit rule so Make knows the one command does it all. -chapters.% top-menu.%: libc-texinfo.sh $(texis-path) Makefile - AWK=$(AWK) $(SHELL) $< $(objpfx) \ - '$(chapters)' \ +chapters.% top-menu.%: libc-texinfo.sh $(texis) Makefile + AWK=$(AWK) $(SHELL) $< '$(chapters)' \ '$(add-chapters)' \ '$(appendices) $(licenses)' +# Generated files directly included from libc.texinfo. +libc-texi-generated = chapters.texi top-menu.texi dir-add.texi \ + libm-err.texi version.texi -$(objpfx)libc.dvi $(objpfx)libc.pdf $(objpfx)libc.info: \ - $(addprefix $(objpfx),$(libc-texi-generated)) -$(objpfx)libc.dvi $(objpfx)libc.pdf: texinfo.tex +libc.dvi libc.pdf libc.info: $(libc-texi-generated) +libc.dvi libc.pdf: texinfo.tex -html: $(objpfx)libc/index.html -$(objpfx)libc/index.html: $(addprefix $(objpfx),$(libc-texi-generated)) - $(MAKEINFO) -P $(objpfx) -o $(objpfx)libc --html libc.texinfo +html: libc/index.html +libc/index.html: $(libc-texi-generated) + $(MAKEINFO) --html libc.texinfo # Generate the summary from the Texinfo source files for each chapter. -$(objpfx)summary.texi: $(objpfx)stamp-summary ; -$(objpfx)stamp-summary: summary.awk $(filter-out $(objpfx)summary.texi, \ - $(texis-path)) - $(AWK) -f $^ | sort -t' ' -df -k 1,1 | tr '\014' '\012' \ - > $(objpfx)summary-tmp - $(move-if-change) $(objpfx)summary-tmp $(objpfx)summary.texi +summary.texi: stamp-summary ; +stamp-summary: summary.awk $(filter-out summary.texi, $(texis)) + $(AWK) -f $^ | sort -t' ' -df -k 1,1 | tr '\014' '\012' > summary-tmp + $(move-if-change) summary-tmp summary.texi touch $@ # Generate a file which can be added to the `dir' content to provide direct # access to the documentation of the function, variables, and other # definitions. -$(objpfx)dir-add.texi: xtract-typefun.awk $(texis-path) +dir-add.texi: xtract-typefun.awk $(texis) (echo "@dircategory GNU C library functions and macros"; \ echo "@direntry"; \ $(AWK) -f $^ | sort; \ @@ -108,23 +96,23 @@ $(objpfx)dir-add.texi: xtract-typefun.awk $(texis-path) mv -f $@.new $@ # The table with the math errors is generated. -$(objpfx)libm-err.texi: $(objpfx)stamp-libm-err -$(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ +libm-err.texi: stamp-libm-err +stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ $(dir)/libm-test-ulps)) pwd=`pwd`; \ - $(PERL) $< $$pwd/.. > $(objpfx)libm-err-tmp - $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi + $(PERL) $< $$pwd/.. > libm-err-tmp + $(move-if-change) libm-err-tmp libm-err.texi touch $@ # Generate a file with the version number. -$(objpfx)version.texi: $(objpfx)stamp-version ; -$(objpfx)stamp-version: $(common-objpfx)config.make - echo "@set VERSION $(version)" > $(objpfx)version-tmp - $(move-if-change) $(objpfx)version-tmp $(objpfx)version.texi +version.texi: stamp-version ; +stamp-version: $(common-objpfx)config.make + echo "@set VERSION $(version)" > version-tmp + $(move-if-change) version-tmp version.texi touch $@ # Generate Texinfo files from the C source for the example programs. -$(objpfx)%.c.texi: examples/%.c +%.c.texi: examples/%.c sed -e '1,/^\*\/$$/d' \ -e 's,[{}],@&,g' \ -e 's,/\*\(@.*\)\*/,\1,g' \ @@ -133,17 +121,14 @@ $(objpfx)%.c.texi: examples/%.c $< | expand > $@.new mv -f $@.new $@ -$(objpfx)%.info: %.texinfo - LANGUAGE=C LC_ALL=C $(MAKEINFO) -P $(objpfx) --output=$@ $< +%.info: %.texinfo + LANGUAGE=C LC_ALL=C $(MAKEINFO) $< -$(objpfx)%.dvi: %.texinfo - cd $(objpfx);$(TEXI2DVI) -I $(shell cd $(${OUTDIR}incl.$$ 4>${OUTDIR}smenu.$$ 5>${OUTDIR}lmenu.$$ +exec 3>incl.$$ 4>smenu.$$ 5>lmenu.$$ build_menu () { while IFS=: read file node; do @@ -54,7 +51,7 @@ collect_nodes $3 | build_menu exec 3>&- 4>&- 5>&- -mv -f ${OUTDIR}incl.$$ ${OUTDIR}chapters.texi +mv -f incl.$$ chapters.texi { echo '@menu' @@ -75,7 +72,7 @@ mv -f ${OUTDIR}incl.$$ ${OUTDIR}chapters.texi } !/^\*/ { print; } - ' ${OUTDIR}smenu.$$ + ' smenu.$$ cat <${OUTDIR}top-menu.texi.$$ -mv -f ${OUTDIR}top-menu.texi.$$ ${OUTDIR}top-menu.texi + cat lmenu.$$ + echo '@end menu'; } >top-menu.texi.$$ +mv -f top-menu.texi.$$ top-menu.texi -rm -f ${OUTDIR}*.$$ +rm -f *.$$ -- 2.7.4