[FFmpeg-devel] [PATCH] build: Fix documentation dependencies and rules
jamal
jamrial at gmail.com
Thu Jul 12 03:41:25 CEST 2012
---
configure | 5 ++++-
doc/Makefile | 12 ++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index c373640..e74b0b1 100755
--- a/configure
+++ b/configure
@@ -1252,6 +1252,7 @@ HAVE_LIST="
nanosleep
netinet_sctp_h
PeekNamedPipe
+ pod2man
poll_h
posix_memalign
pthread_cancel
@@ -1294,6 +1295,7 @@ HAVE_LIST="
sys_time_h
sys_videoio_h
termios_h
+ texi2html
threads
trunc
truncf
@@ -1780,7 +1782,7 @@ ffprobe_deps="avcodec avformat"
ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
ffserver_extralibs='$ldl'
-doc_deps="texi2html"
+doc_deps_any="texi2html makeinfo pod2man"
# tests
@@ -3379,6 +3381,7 @@ enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
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/videodev.h
diff --git a/doc/Makefile b/doc/Makefile
index 16f6a0d..a9c9ea6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -13,10 +13,10 @@ HTMLPAGES = $(PROGS-yes:%=doc/%.html) \
TXTPAGES = doc/fate.txt \
-DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
-ifdef HAVE_MAKEINFO
-DOCS += $(TXTPAGES)
-endif
+DOCS-$(HAVE_TEXI2HTML) += $(HTMLPAGES)
+DOCS-$(HAVE_POD2MAN) += $(MANPAGES) $(PODPAGES)
+DOCS-$(HAVE_MAKEINFO) += $(TXTPAGES)
+DOCS = $(DOCS-yes)
all-$(CONFIG_DOC): documentation
@@ -54,11 +54,15 @@ doc/%.1: doc/%.pod $(GENTEXI)
$(DOCS): | doc/
+install-man:
+
+ifdef HAVE_POD2MAN
install-progs-$(CONFIG_DOC): install-man
install-man: $(MANPAGES)
$(Q)mkdir -p "$(MANDIR)/man1"
$(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
+endif
uninstall: uninstall-man
--
1.7.8.6
More information about the ffmpeg-devel
mailing list