We now don't build anything from Texinfo, so we can remove
some redundant Makefile pattern rules and the rule for
generating the version.texi file that used to be included
from many Texinfo source files.
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
---
Makefile | 31 +------------------------------
rules.mak | 14 +-------------
2 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/Makefile b/Makefile
index 98f58b84ef0..36fe8d6e641 100644
--- a/Makefile
+++ b/Makefile
@@ -732,8 +732,7 @@ clean: recurse-clean
! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll
\
-exec rm {} +
rm -f $(edk2-decompressed)
- rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~
*/*~
- rm -f fsdev/*.pod scsi/*.pod
+ rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *~ */*~
rm -f qemu-img-cmds.h
rm -f ui/shader/*-vert.h ui/shader/*-frag.h
@# May not be present in generated-files-y
@@ -766,7 +765,6 @@ distclean: clean
rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols
rm -f config.log
rm -f linux-headers/asm
- rm -f docs/version.texi
rm -rf .doctrees
$(call clean-manual,devel)
$(call clean-manual,interop)
@@ -987,31 +985,6 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \
ui/shader/texture-blit-frag.h
# documentation
-MAKEINFO=makeinfo
-MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
-MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
-TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)"
-DCONFDIR="$(qemu_confdir)"
-TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
-
-docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
- $(call quiet-command,(\
- echo "@set VERSION $(VERSION)" && \
- echo "@set CONFDIR $(qemu_confdir)" \
- )> $@,"GEN","$@")
-
-%.html: %.texi docs/version.texi
- $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers
\
- --html $< -o $@,"GEN","$@")
-
-%.info: %.texi docs/version.texi
- $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@")
-
-%.txt: %.texi docs/version.texi
- $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers
\
- --plaintext $< -o $@,"GEN","$@")
-
-%.pdf: %.texi docs/version.texi
- $(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@")
# Sphinx builds all its documentation at once in one invocation
# and handles "don't rebuild things unless necessary" itself.
@@ -1081,8 +1054,6 @@ $(MANUAL_BUILDDIR)/index.html:
$(SRC_PATH)/docs/index.html.in qemu-version.h
html: sphinxdocs
-$(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl
-
# Reports/Analysis
%/coverage-report.html:
diff --git a/rules.mak b/rules.mak
index e39b073d464..00d323a071a 100644
--- a/rules.mak
+++ b/rules.mak
@@ -144,7 +144,7 @@ cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc
/dev/null \
cc-c-option = $(if $(shell $(CC) $1 $2 -c -o /dev/null -xc /dev/null \
>/dev/null 2>&1 && echo OK), $2, $3)
-VPATH_SUFFIXES = %.c %.h %.S %.cc %.cpp %.m %.mak %.texi %.sh %.rc Kconfig%
%.json.in
+VPATH_SUFFIXES = %.c %.h %.S %.cc %.cpp %.m %.mak %.sh %.rc Kconfig% %.json.in
set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath
$(PATTERN) $1)))
# install-prog list, dir
@@ -381,18 +381,6 @@ define unnest-vars
$(eval $v := $(filter-out %/,$($v))))
endef
-TEXI2MAN = $(call quiet-command, \
- perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $(TEXI2PODFLAGS) $< $@.pod
&& \
- $(POD2MAN) --section=$(subst .,,$(suffix $@)) --center=" " --release="
" $@.pod > $@, \
- "GEN","$@")
-
-%.1:
- $(call TEXI2MAN)
-%.7:
- $(call TEXI2MAN)
-%.8:
- $(call TEXI2MAN)
-
GEN_SUBST = $(call quiet-command, \
sed -e "s!@libexecdir@!$(libexecdir)!g" < $< > $@, \
"GEN","$@")
--
2.20.1
