From 146ea95228c34334247f1d100c6cd261e7866d13 Mon Sep 17 00:00:00 2001 From: Nicolas Boos Date: Mon, 5 Jul 2004 18:06:16 +0000 Subject: [PATCH] autobuild doc if possible patch by (Nicolas Boos ) Originally committed as revision 3288 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 9 ++++++++- configure | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 277be416d1..420275eaf0 100644 --- a/Makefile +++ b/Makefile @@ -70,11 +70,15 @@ else TEST=test endif +ifeq ($(BUILD_DOC),yes) +DOC=documentation +endif + OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec -all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) +all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) lib: $(MAKE) -C libavcodec all @@ -112,6 +116,9 @@ ffplay.o: ffplay.c videohook: .libs $(MAKE) -C vhook all +documentation: + $(MAKE) -C doc all + .PHONY: install install: all install-man $(INSTALLVHOOK) diff --git a/configure b/configure index 01d7d9ee61..6df06c8bd1 100755 --- a/configure +++ b/configure @@ -900,6 +900,14 @@ fi fi fi +########################################## +# texi2html probe + +texi2html=no +if texi2html -version >/dev/null 2>&1; then +texi2html=yes +fi + case "`$cc -v 2>&1 | grep version`" in *gcc*) CFLAGS="-Wall $CFLAGS" @@ -1123,6 +1131,9 @@ if test "$sdl" = "yes" ; then echo "SDL_LIBS=`sdl-config --libs`" >> config.mak echo "SDL_CFLAGS=`sdl-config --cflags`" >> config.mak fi +if test "$texi2html" = "yes"; then + echo "BUILD_DOC=yes" >> config.mak +fi if test "$have_lrintf" = "yes" ; then echo "#define HAVE_LRINTF 1" >> $TMPH fi