generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Fix documentation dependencies and rules

Browse Source
This commit is contained in:
jamal 2012-07-11 22:41:25 -03:00 committed by Stefano Sabatini
parent bd58f00ec1
commit 3e03f8d8b2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -1255,6 +1255,7 @@ HAVE_LIST="
nanosleep nanosleep
netinet_sctp_h netinet_sctp_h
PeekNamedPipe PeekNamedPipe
pod2man
poll_h poll_h
posix_memalign posix_memalign
pthread_cancel pthread_cancel
@ -1297,6 +1298,7 @@ HAVE_LIST="
sys_time_h sys_time_h
sys_videoio_h sys_videoio_h
termios_h termios_h
texi2html
threads threads
trunc trunc
truncf truncf
@ -1784,7 +1786,7 @@ ffprobe_deps="avcodec avformat"
ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
ffserver_extralibs='$ldl' ffserver_extralibs='$ldl'
doc_deps="texi2html" doc_deps_any="texi2html makeinfo pod2man"
# tests # tests
@ -3385,6 +3387,7 @@ enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
check_header linux/fb.h check_header linux/fb.h
check_header linux/videodev.h check_header linux/videodev.h

12
doc/Makefile
View File

@ -12,10 +12,10 @@ HTMLPAGES = $(PROGS-yes:%=doc/%.html) \
TXTPAGES = doc/fate.txt \ TXTPAGES = doc/fate.txt \
DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES) DOCS-$(HAVE_TEXI2HTML) += $(HTMLPAGES)
ifdef HAVE_MAKEINFO DOCS-$(HAVE_POD2MAN) += $(MANPAGES) $(PODPAGES)
DOCS += $(TXTPAGES) DOCS-$(HAVE_MAKEINFO) += $(TXTPAGES)
endif DOCS = $(DOCS-yes)
all-$(CONFIG_DOC): documentation all-$(CONFIG_DOC): documentation
@ -53,11 +53,15 @@ doc/%.1: doc/%.pod $(GENTEXI)
$(DOCS): | doc/ $(DOCS): | doc/
install-man:
ifdef HAVE_POD2MAN
install-progs-$(CONFIG_DOC): install-man install-progs-$(CONFIG_DOC): install-man
install-man: $(MANPAGES) install-man: $(MANPAGES)
$(Q)mkdir -p "$(MANDIR)/man1" $(Q)mkdir -p "$(MANDIR)/man1"
$(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1" $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
endif
uninstall: uninstall-man uninstall: uninstall-man