RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c' 

* commit 'f187557ab4612776f7f527ecf3d40062975c3e4c':
  build: more fine-grained dependencies for documentation build tools

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-24 04:55:35 +01:00
parent 3d5a5e86be f187557ab4
commit c0237d19a0
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1228,7 +1228,6 @@ EXTERNAL_LIBRARY_LIST="
"
DOCUMENT_LIST="
doc
htmlpages
manpages
podpages
@ -2295,7 +2294,6 @@ podpages_deps="perl"
manpages_deps="perl pod2man"
htmlpages_deps="texi2html"
txtpages_deps="makeinfo"
doc_deps_any="manpages htmlpages podpages txtpages"
# default parameters
@ -4376,7 +4374,7 @@ 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
perl -v > /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

7
doc/Makefile
View File

@ -36,9 +36,8 @@ DOCS-$(CONFIG_MANPAGES) += $(MANPAGES)
DOCS-$(CONFIG_TXTPAGES) += $(TXTPAGES)
DOCS = $(DOCS-yes)
all-$(CONFIG_DOC): doc
doc: documentation
all: $(DOCS)
apidoc: doc/doxy/html
documentation: $(DOCS)
@ -95,7 +94,7 @@ install-html:
install-man:
ifdef CONFIG_HTMLPAGES
install-progs-$(CONFIG_DOC): install-html
install-progs: install-html
install-html: $(HTMLPAGES)
$(Q)mkdir -p "$(DOCDIR)"
@ -103,7 +102,7 @@ install-html: $(HTMLPAGES)
endif
ifdef CONFIG_MANPAGES
install-progs-$(CONFIG_DOC): install-man
install-progs: install-man
install-man: $(MANPAGES)
$(Q)mkdir -p "$(MANDIR)/man1"