[FFmpeg-devel] [PATCH 4/5] Revert "doc: fate: Support building a plain text version"

[Timothy Gu]

This reverts commit abab44086fa5b7b3c4cd3f5eabc1348977b506b9.

Conflicts:
	.gitignore
	configure
	doc/Makefile
---
 .gitignore   | 1 -
 configure    | 2 --
 doc/Makefile | 9 ---------
 3 files changed, 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7d8adda..2792aae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,6 @@
 /doc/examples/pc-uninstalled
 /doc/examples/resampling_audio
 /doc/examples/scaling_video
-/doc/fate.txt
 /doc/doxy/html/
 /doc/print_options
 /lcov/
diff --git a/configure b/configure
index 5f80764..084eac1 100755
--- a/configure
+++ b/configure
@@ -1495,7 +1495,6 @@ HAVE_LIST="
     machine_ioctl_bt848_h
     machine_ioctl_meteor_h
     machine_rw_barrier
-    makeinfo
     malloc_h
     MapViewOfFile
     memalign
@@ -4355,7 +4354,6 @@ fi
 enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
 
 texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
-makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
 perl --version > /dev/null 2>&1 && enable perl || disable perl
 pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
 rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
diff --git a/doc/Makefile b/doc/Makefile
index 50a68b4..e7e81b1 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -27,13 +27,9 @@ HTMLPAGES   = $(PROGS-yes:%=doc/%.html) $(PROGS-yes:%=doc/%-all.html) $(COMPONEN
               doc/nut.html                                              \
               doc/platform.html                                         \
 
-TXTPAGES    = doc/fate.txt                                              \
-
-
 DOCS-$(CONFIG_HTMLPAGES) += $(HTMLPAGES)
 DOCS-$(CONFIG_PODPAGES)  += $(PODPAGES)
 DOCS-$(CONFIG_MANPAGES)  += $(MANPAGES)
-DOCS-$(CONFIG_TXTPAGES)  += $(TXTPAGES)
 DOCS = $(DOCS-yes)
 
 all-$(CONFIG_DOC): doc
@@ -45,11 +41,6 @@ documentation: $(DOCS)
 
 TEXIDEP = awk '/^@(verbatim)?include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)
 
-doc/%.txt: TAG = TXT
-doc/%.txt: doc/%.texi
-	$(Q)$(TEXIDEP)
-	$(M)makeinfo --force --no-headers -o $@ $< 2>/dev/null
-
 GENTEXI  = format codec
 GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
 
-- 
1.8.3.2