This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[BZ #13739] Remove standalone manual support
- From: Andreas Jaeger <aj at suse dot de>
- To: libc-alpha at sources dot redhat dot com
- Date: Sat, 21 Apr 2012 21:00:41 +0200
- Subject: [BZ #13739] Remove standalone manual support
As Joseph states in #13739, we don't need a separate manual distribution
tar ball anymore. I've removed support for it.
Testing with building glibc on Linux/x86-64 and running make info,
Ok to commit?
Andreas
2012-04-21 Andreas Jaeger <aj@suse.de>
[BZ #13739]
* manual/Makefile: Remove make dist support, there's no
need for a stand-alone documentation tar ball.
(TEXI2DVI): Define always, it's not in Makeconfig.
(dist): Removed.
(tar-it): Removed.
(edition): Removed.
(glibc-doc-$(edition).tar): Removed
(%.Z): Removed.
(%.gz): Removed.
(%.uu): Removed.
(ETAGS): Remove, it's in Makeconfig.
(move-if-change): Remove, it's in Makeconfig.
diff --git a/manual/Makefile b/manual/Makefile
index daddd29..29e36c2 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -30,14 +30,9 @@ dvi: libc.dvi
pdf: libc.pdf
# Get glibc's configuration info.
-ifneq (,$(wildcard ../Makeconfig))
include ../Makeconfig
-else
-MAKEINFO = makeinfo
-TEXI2DVI = texi2dvi
-AWK = gawk
-endif
+TEXI2DVI = texi2dvi
TEXI2PDF = texi2dvi --pdf
ifneq ($(strip $(MAKEINFO)),:)
@@ -45,10 +40,6 @@ all: info
info: libc.info
endif
-# scripts we use
-ifndef move-if-change
-move-if-change = ./move-if-change
-endif
mkinstalldirs = $(..)scripts/mkinstalldirs
chapters = $(addsuffix .texi, \
@@ -145,27 +136,6 @@ minimal-dist = summary.awk texis.awk tsort.awk libc-texinfo.sh libc.texinfo \
$(filter-out summary.texi, $(nonexamples)) \
$(patsubst %.c.texi,examples/%.c, $(examples))
-tar-it = tar chovf $@ $^
-
-edition := $(shell sed -n 's/^@set EDITION \([0-9][0-9.]*\)[^0-9.]*.*$$/\1/p' \
- libc.texinfo)
-
-glibc-doc-$(edition).tar: $(doc-only-dist) $(distribute)
- @rm -f glibc-doc-$(edition)
- ln -s . glibc-doc-$(edition)
- tar chovf $@ $(addprefix glibc-doc-$(edition)/,$^)
- rm -f glibc-doc-$(edition)
-
-%.Z: %
- compress -c $< > $@.new
- mv -f $@.new $@
-%.gz: %
- gzip -9 -c $< > $@.new
- mv -f $@.new $@
-%.uu: %
- uuencode $< < $< > $@.new
- mv -f $@.new $@
-
.PHONY: mostlyclean distclean realclean clean
mostlyclean:
-rm -f libc.dvi libc.pdf libc.tmp libc.info*
@@ -200,17 +170,6 @@ $(inst_infodir)/libc.info: libc.info installdirs
installdirs:
$(mkinstalldirs) $(inst_infodir)
-.PHONY: dist
-dist: # glibc-doc-$(edition).tar.gz
-
-ifneq (,$(wildcard ../Make-dist))
-dist: ../Make-dist
- $(MAKE) -f $< $(Make-dist-args)
-endif
-
-ifndef ETAGS
-ETAGS = etags -T
-endif
TAGS: $(minimal-dist)
$(ETAGS) -o $@ $^
--
Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 NÃrnberg, Germany
GF: Jeff Hawn,Jennifer Guild,Felix ImendÃrffer,HRB16746 (AG NÃrnberg)
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126