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

Allow disabling doc generation with --disable-doc

Browse Source 
Originally committed as revision 20424 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2009-10-31 15:58:49 +00:00
parent ad212cc6ba
commit c73f65d979
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -33,11 +33,11 @@ FF_LDFLAGS := $(FFLDFLAGS)
FF_EXTRALIBS := $(FFEXTRALIBS) FF_EXTRALIBS := $(FFEXTRALIBS)
FF_DEP_LIBS := $(DEP_LIBS) FF_DEP_LIBS := $(DEP_LIBS)
ALL_TARGETS-$(BUILD_DOC) += documentation ALL_TARGETS-$(CONFIG_DOC) += documentation
ifdef PROGS ifdef PROGS
INSTALL_TARGETS-yes += install-progs install-data INSTALL_TARGETS-yes += install-progs install-data
INSTALL_TARGETS-$(BUILD_DOC) += install-man INSTALL_TARGETS-$(CONFIG_DOC) += install-man
endif endif
INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs

7
configure vendored
View File

@@ -78,6 +78,7 @@ show_help(){
echo " --enable-version3 upgrade (L)GPL to version 3 [no]" echo " --enable-version3 upgrade (L)GPL to version 3 [no]"
echo " --enable-nonfree allow use of nonfree code, the resulting libs" echo " --enable-nonfree allow use of nonfree code, the resulting libs"
echo " and binaries will be unredistributable [no]" echo " and binaries will be unredistributable [no]"
echo " --disable-doc do not build documentation"
echo " --disable-ffmpeg disable ffmpeg build" echo " --disable-ffmpeg disable ffmpeg build"
echo " --disable-ffplay disable ffplay build" echo " --disable-ffplay disable ffplay build"
echo " --disable-ffserver disable ffserver build" echo " --disable-ffserver disable ffserver build"
@@ -823,6 +824,7 @@ CONFIG_LIST="
avisynth avisynth
beos_netserver beos_netserver
bzlib bzlib
doc
fastdiv fastdiv
ffmpeg ffmpeg
ffplay ffplay
@@ -1261,6 +1263,7 @@ ffplay_deps="sdl"
ffserver_deps="ffm_muxer rtp_protocol rtsp_demuxer" ffserver_deps="ffm_muxer rtp_protocol rtsp_demuxer"
ffserver_extralibs='$ldl' ffserver_extralibs='$ldl'
doc_deps="texi2html"
# default parameters # default parameters
@@ -1297,6 +1300,7 @@ host_os=$target_os
# configurable options # configurable options
enable debug enable debug
enable doc
enable fastdiv enable fastdiv
enable ffmpeg enable ffmpeg
enable ffplay enable ffplay
@@ -2708,9 +2712,6 @@ if enabled sdl; 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 enabled texi2html; then
echo "BUILD_DOC=yes" >> config.mak
fi
get_version(){ get_version(){
name=$1 name=$1