AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 14:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not build manual in the source directory"

Browse Source 
This reverts commit e3945c47bd.

reverting since it breaks building.
This commit is contained in:
Andreas Jaeger 2012-05-04 17:09:56 +02:00
parent 1261f5d10c
commit 110c96ff29
5 changed files with 95 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ChangeLog
View File

@ -1,33 +1,4 @@
2012-05-04 Andreas Jaeger <aj@suse.de> 2012-05-02 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
[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 <azanella@linux.vnet.ibm.com>
* sysdeps/ieee754/ldbl-128ibm/e_acosl.c (__ieee754_acosl): Fix * sysdeps/ieee754/ldbl-128ibm/e_acosl.c (__ieee754_acosl): Fix
long double comparison inaccuracies. long double comparison inaccuracies.

12
NEWS
View File

@ -18,12 +18,12 @@ Version 2.16
12047, 12340, 13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 12047, 12340, 13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531,
13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13566, 13583, 13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13566, 13583,
13592, 13618, 13637, 13656, 13658, 13673, 13691, 13695, 13704, 13705, 13592, 13618, 13637, 13656, 13658, 13673, 13691, 13695, 13704, 13705,
13706, 13726, 13738, 13739, 13750, 13758, 13760, 13761, 13775, 13786, 13706, 13726, 13738, 13739, 13758, 13760, 13761, 13775, 13786, 13792,
13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854, 13871,
13871, 13872, 13873, 13879, 13883, 13886, 13892, 13895, 13908, 13910, 13872, 13873, 13879, 13883, 13886, 13892, 13895, 13908, 13910, 13911,
13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13924,
13924, 13926, 13927, 13928, 13938, 13941, 13942, 13963, 13967, 13970, 13926, 13927, 13928, 13938, 13941, 13942, 13963, 13967, 13970, 13973,
13973, 14027, 14033, 14034, 14040, 14049, 14055 14027, 14033, 14034, 14040, 14049, 14055
* ISO C11 support: * ISO C11 support:

30
manual/.gitignore vendored Normal file
View File

@ -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

113
manual/Makefile
View File

@ -26,19 +26,18 @@ INSTALL_INFO = install-info
.PHONY: all dvi pdf info html .PHONY: all dvi pdf info html
all: dvi all: dvi
dvi: libc.dvi
pdf: libc.pdf
# Get glibc's configuration info. # Get glibc's configuration info.
include ../Makeconfig include ../Makeconfig
dvi: $(objpfx)libc.dvi
pdf: $(objpfx)libc.pdf
TEXI2DVI = texi2dvi TEXI2DVI = texi2dvi
TEXI2PDF = texi2dvi --pdf TEXI2PDF = texi2dvi --pdf
ifneq ($(strip $(MAKEINFO)),:) ifneq ($(strip $(MAKEINFO)),:)
all: info all: info
info: $(objpfx)libc.info info: libc.info
endif endif
mkinstalldirs = $(..)scripts/mkinstalldirs 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 appendices = lang.texi header.texi install.texi maint.texi contrib.texi
licenses = freemanuals.texi lgpl-2.1.texi fdl-1.3.texi licenses = freemanuals.texi lgpl-2.1.texi fdl-1.3.texi
-include $(objpfx)texis -include texis
$(objpfx)texis: texis.awk $(chapters) $(add-chapters) $(appendices) $(licenses) texis: texis.awk $(chapters) $(add-chapters) $(appendices) $(licenses)
$(AWK) -f $^ > $@.T $(AWK) -f $^ > $@.T
mv -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), \ examples = $(filter-out $(foreach d, $(add-ons), ../$d/%.c.texi), \
$(filter %.c.texi, $(texis))) $(filter %.c.texi, $(texis)))
# Kludge: implicit rule so Make knows the one command does it all.
chapters.% top-menu.%: libc-texinfo.sh $(texis) Makefile
AWK=$(AWK) $(SHELL) $< '$(chapters)' \
'$(add-chapters)' \
'$(appendices) $(licenses)'
# Generated files directly included from libc.texinfo. # Generated files directly included from libc.texinfo.
libc-texi-generated = chapters.texi top-menu.texi dir-add.texi \ libc-texi-generated = chapters.texi top-menu.texi dir-add.texi \
libm-err.texi version.texi libm-err.texi version.texi
# Add path to build dir for generated files libc.dvi libc.pdf libc.info: $(libc-texi-generated)
texis-path := $(filter-out $(libc-texi-generated) summary.texi $(examples), \ libc.dvi libc.pdf: texinfo.tex
$(texis)) \
$(addprefix $(objpfx),$(filter $(libc-texi-generated) summary.texi \
$(examples), $(texis)))
# Kludge: implicit rule so Make knows the one command does it all. html: libc/index.html
chapters.% top-menu.%: libc-texinfo.sh $(texis-path) Makefile libc/index.html: $(libc-texi-generated)
AWK=$(AWK) $(SHELL) $< $(objpfx) \ $(MAKEINFO) --html libc.texinfo
'$(chapters)' \
'$(add-chapters)' \
'$(appendices) $(licenses)'
$(objpfx)libc.dvi $(objpfx)libc.pdf $(objpfx)libc.info: \
$(addprefix $(objpfx),$(libc-texi-generated))
$(objpfx)libc.dvi $(objpfx)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
# Generate the summary from the Texinfo source files for each chapter. # Generate the summary from the Texinfo source files for each chapter.
$(objpfx)summary.texi: $(objpfx)stamp-summary ; summary.texi: stamp-summary ;
$(objpfx)stamp-summary: summary.awk $(filter-out $(objpfx)summary.texi, \ stamp-summary: summary.awk $(filter-out summary.texi, $(texis))
$(texis-path)) $(AWK) -f $^ | sort -t' ' -df -k 1,1 | tr '\014' '\012' > summary-tmp
$(AWK) -f $^ | sort -t' ' -df -k 1,1 | tr '\014' '\012' \ $(move-if-change) summary-tmp summary.texi
> $(objpfx)summary-tmp
$(move-if-change) $(objpfx)summary-tmp $(objpfx)summary.texi
touch $@ touch $@
# Generate a file which can be added to the `dir' content to provide direct # Generate a file which can be added to the `dir' content to provide direct
# access to the documentation of the function, variables, and other # access to the documentation of the function, variables, and other
# definitions. # 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 "@dircategory GNU C library functions and macros"; \
echo "@direntry"; \ echo "@direntry"; \
$(AWK) -f $^ | sort; \ $(AWK) -f $^ | sort; \
@ -108,23 +96,23 @@ $(objpfx)dir-add.texi: xtract-typefun.awk $(texis-path)
mv -f $@.new $@ mv -f $@.new $@
# The table with the math errors is generated. # The table with the math errors is generated.
$(objpfx)libm-err.texi: $(objpfx)stamp-libm-err libm-err.texi: stamp-libm-err
$(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
$(dir)/libm-test-ulps)) $(dir)/libm-test-ulps))
pwd=`pwd`; \ pwd=`pwd`; \
$(PERL) $< $$pwd/.. > $(objpfx)libm-err-tmp $(PERL) $< $$pwd/.. > libm-err-tmp
$(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi $(move-if-change) libm-err-tmp libm-err.texi
touch $@ touch $@
# Generate a file with the version number. # Generate a file with the version number.
$(objpfx)version.texi: $(objpfx)stamp-version ; version.texi: stamp-version ;
$(objpfx)stamp-version: $(common-objpfx)config.make stamp-version: $(common-objpfx)config.make
echo "@set VERSION $(version)" > $(objpfx)version-tmp echo "@set VERSION $(version)" > version-tmp
$(move-if-change) $(objpfx)version-tmp $(objpfx)version.texi $(move-if-change) version-tmp version.texi
touch $@ touch $@
# Generate Texinfo files from the C source for the example programs. # Generate Texinfo files from the C source for the example programs.
$(objpfx)%.c.texi: examples/%.c %.c.texi: examples/%.c
sed -e '1,/^\*\/$$/d' \ sed -e '1,/^\*\/$$/d' \
-e 's,[{}],@&,g' \ -e 's,[{}],@&,g' \
-e 's,/\*\(@.*\)\*/,\1,g' \ -e 's,/\*\(@.*\)\*/,\1,g' \
@ -133,17 +121,14 @@ $(objpfx)%.c.texi: examples/%.c
$< | expand > $@.new $< | expand > $@.new
mv -f $@.new $@ mv -f $@.new $@
$(objpfx)%.info: %.texinfo %.info: %.texinfo
LANGUAGE=C LC_ALL=C $(MAKEINFO) -P $(objpfx) --output=$@ $< LANGUAGE=C LC_ALL=C $(MAKEINFO) $<
$(objpfx)%.dvi: %.texinfo %.dvi: %.texinfo
cd $(objpfx);$(TEXI2DVI) -I $(shell cd $(<D) && pwd) --output=$@ \ $(TEXI2DVI) $<
$(shell cd $(<D) && pwd)/$<
$(objpfx)%.pdf: %.texinfo
cd $(objpfx);$(TEXI2PDF) -I $(shell cd $(<D) && pwd) --output=$@ \
$(shell cd $(<D) && pwd)/$<
%.pdf: %.texinfo
$(TEXI2PDF) $<
# Distribution. # Distribution.
minimal-dist = summary.awk texis.awk tsort.awk libc-texinfo.sh libc.texinfo \ minimal-dist = summary.awk texis.awk tsort.awk libc-texinfo.sh libc.texinfo \
@ -151,17 +136,19 @@ minimal-dist = summary.awk texis.awk tsort.awk libc-texinfo.sh libc.texinfo \
$(filter-out summary.texi, $(nonexamples)) \ $(filter-out summary.texi, $(nonexamples)) \
$(patsubst %.c.texi,examples/%.c, $(examples)) $(patsubst %.c.texi,examples/%.c, $(examples))
.PHONY: mostlyclean distclean realclean clean
mostlyclean:
-rm -f libc.dvi libc.pdf libc.tmp libc.info*
-rm -f $(objpfx)stubs
-rm -f $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)
clean: mostlyclean
distclean: clean
indices = cp fn pg tp vr ky indices = cp fn pg tp vr ky
generated-dirs := libc realclean: distclean
generated = libc.dvi libc.pdf libc.tmp libc.info* \ -rm -f texis summary.texi stamp-summary *.c.texi
stubs \ -rm -f $(foreach index,$(indices),libc.$(index) libc.$(index)s)
texis summary.texi stamp-summary *.c.texi \ -rm -f libc.log libc.aux libc.toc
$(foreach index,$(indices),libc.$(index) libc.$(index)s) \ -rm -f $(libc-texi-generated)
libc.log libc.aux libc.toc \
$(libc-texi-generated) \
stamp-libm-err stamp-version
include ../Makerules
.PHONY: install subdir_install installdirs install-data .PHONY: install subdir_install installdirs install-data
install-data subdir_install: install install-data subdir_install: install
@ -175,9 +162,9 @@ endif
# Catchall implicit rule for other installation targets from the parent. # Catchall implicit rule for other installation targets from the parent.
install-%: ; install-%: ;
$(inst_infodir)/libc.info: $(objpfx)libc.info installdirs $(inst_infodir)/libc.info: libc.info installdirs
for file in $<*; do \ for file in $<*; do \
$(INSTALL_DATA) $$file $(@D)/; \ $(INSTALL_DATA) $$file $(@D)/$$file; \
done done
installdirs: installdirs:

19
manual/libc-texinfo.sh
View File

@ -1,13 +1,10 @@
#! /bin/sh #! /bin/sh
OUTDIR=$1
shift
# Create libc.texinfo from the chapter files. # Create libc.texinfo from the chapter files.
trap "rm -f ${OUTDIR}*.$$; exit 1" 1 2 15 trap "rm -f *.$$; exit 1" 1 2 15
exec 3>${OUTDIR}incl.$$ 4>${OUTDIR}smenu.$$ 5>${OUTDIR}lmenu.$$ exec 3>incl.$$ 4>smenu.$$ 5>lmenu.$$
build_menu () { build_menu () {
while IFS=: read file node; do while IFS=: read file node; do
@ -54,7 +51,7 @@ collect_nodes $3 | build_menu
exec 3>&- 4>&- 5>&- exec 3>&- 4>&- 5>&-
mv -f ${OUTDIR}incl.$$ ${OUTDIR}chapters.texi mv -f incl.$$ chapters.texi
{ {
echo '@menu' echo '@menu'
@ -75,7 +72,7 @@ mv -f ${OUTDIR}incl.$$ ${OUTDIR}chapters.texi
} }
!/^\*/ { print; } !/^\*/ { print; }
' ${OUTDIR}smenu.$$ ' smenu.$$
cat <<EOF cat <<EOF
* Free Manuals:: Free Software Needs Free Documentation. * Free Manuals:: Free Software Needs Free Documentation.
* Copying:: The GNU Lesser General Public License says * Copying:: The GNU Lesser General Public License says
@ -93,8 +90,8 @@ Indices
--- The Detailed Node Listing --- --- The Detailed Node Listing ---
EOF EOF
cat ${OUTDIR}lmenu.$$ cat lmenu.$$
echo '@end menu'; } >${OUTDIR}top-menu.texi.$$ echo '@end menu'; } >top-menu.texi.$$
mv -f ${OUTDIR}top-menu.texi.$$ ${OUTDIR}top-menu.texi mv -f top-menu.texi.$$ top-menu.texi
rm -f ${OUTDIR}*.$$ rm -f *.$$