Commit 146ea952 authored by Nicolas Boos's avatar Nicolas Boos Committed by Michael Niedermayer

autobuild doc if possible patch by (Nicolas Boos <nicolas.boos at wanadoo dot fr>)

Originally committed as revision 3288 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4994af2f
...@@ -70,11 +70,15 @@ else ...@@ -70,11 +70,15 @@ else
TEST=test TEST=test
endif endif
ifeq ($(BUILD_DOC),yes)
DOC=documentation
endif
OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
lib: lib:
$(MAKE) -C libavcodec all $(MAKE) -C libavcodec all
...@@ -112,6 +116,9 @@ ffplay.o: ffplay.c ...@@ -112,6 +116,9 @@ ffplay.o: ffplay.c
videohook: .libs videohook: .libs
$(MAKE) -C vhook all $(MAKE) -C vhook all
documentation:
$(MAKE) -C doc all
.PHONY: install .PHONY: install
install: all install-man $(INSTALLVHOOK) install: all install-man $(INSTALLVHOOK)
......
...@@ -900,6 +900,14 @@ fi ...@@ -900,6 +900,14 @@ fi
fi 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 case "`$cc -v 2>&1 | grep version`" in
*gcc*) *gcc*)
CFLAGS="-Wall $CFLAGS" CFLAGS="-Wall $CFLAGS"
...@@ -1123,6 +1131,9 @@ if test "$sdl" = "yes" ; then ...@@ -1123,6 +1131,9 @@ if test "$sdl" = "yes" ; then
echo "SDL_LIBS=`sdl-config --libs`" >> config.mak echo "SDL_LIBS=`sdl-config --libs`" >> config.mak
echo "SDL_CFLAGS=`sdl-config --cflags`" >> config.mak echo "SDL_CFLAGS=`sdl-config --cflags`" >> config.mak
fi fi
if test "$texi2html" = "yes"; then
echo "BUILD_DOC=yes" >> config.mak
fi
if test "$have_lrintf" = "yes" ; then if test "$have_lrintf" = "yes" ; then
echo "#define HAVE_LRINTF 1" >> $TMPH echo "#define HAVE_LRINTF 1" >> $TMPH
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment