virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

build: more fine-grained dependencies for documentation build tools

Browse Source 
Perl is needed to build the manual pages, texi2html for the HTML pages.
This commit is contained in:
Diego Biurrun 2013-11-21 16:57:56 -08:00
parent 6f270da61b
commit f187557ab4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1107,7 +1107,6 @@ CONFIG_LIST="
$LIBRARY_LIST $LIBRARY_LIST
$PROGRAM_LIST $PROGRAM_LIST
dct dct
doc
error_resilience error_resilience
fft fft
gpl gpl
@ -1119,6 +1118,7 @@ CONFIG_LIST="
memalign_hack memalign_hack
network network
nonfree nonfree
perl
pic pic
rdft rdft
runtime_cpudetect runtime_cpudetect
@ -1128,6 +1128,7 @@ CONFIG_LIST="
sram sram
static static
swscale_alpha swscale_alpha
texi2html
thumb thumb
version3 version3
xmm_clobber_test xmm_clobber_test
@ -1963,8 +1964,6 @@ avserver_deps="avformat fork !shared"
avserver_select="ffm_muxer rtp_protocol rtsp_demuxer" avserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
avserver_extralibs='$ldl' avserver_extralibs='$ldl'
doc_deps="texi2html"
# default parameters # default parameters
logfile="config.log" logfile="config.log"
@ -3869,6 +3868,7 @@ if check_pkg_config sdl SDL_events.h SDL_PollEvent; then
enable sdl enable sdl
fi fi
perl -v > /dev/null 2>&1 && enable perl || disable perl
texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
check_header linux/fb.h check_header linux/fb.h

9
doc/Makefile
View File

@ -10,9 +10,11 @@ HTMLPAGES = $(PROGS-yes:%=doc/%.html) \
doc/nut.html \ doc/nut.html \
doc/platform.html \ doc/platform.html \
DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES) DOCS-$(CONFIG_PERL) += $(MANPAGES) $(PODPAGES)
DOCS-$(CONFIG_TEXI2HTML) += $(HTMLPAGES)
DOCS = $(DOCS-yes)
all-$(CONFIG_DOC): documentation all: $(DOCS)
apidoc: doc/doxy/html apidoc: doc/doxy/html
documentation: $(DOCS) documentation: $(DOCS)
@ -45,7 +47,8 @@ $(DOCS) doc/doxy/html: | doc/
doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS) doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^ $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
install-progs-$(CONFIG_DOC): install-doc install-man install-progs-$(CONFIG_PERL): install-man
install-progs-$(CONFIG_TEXI2HTML): install-doc
install-doc: $(HTMLPAGES) install-doc: $(HTMLPAGES)
$(Q)mkdir -p "$(DOCDIR)" $(Q)mkdir -p "$(DOCDIR)"