From 110c96ff292adf9c5be51a8a22ee8ff8e1af3959 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 4 May 2012 17:09:56 +0200 Subject: Revert "Do not build manual in the source directory" This reverts commit e3945c47bdac1149a1fec5d46bd567a248cd17b9. reverting since it breaks building. --- manual/Makefile | 111 +++++++++++++++++++++++++------------------------------- 1 file changed, 49 insertions(+), 62 deletions(-) (limited to 'manual/Makefile') diff --git a/manual/Makefile b/manual/Makefile index 08afecbbf2..29e36c2453 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 $(