Commit d89f2fa9 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

configure: Add separate list for libraries and use where appropriate

parent 947f9336
......@@ -113,6 +113,7 @@ Component options:
--disable-avdevice disable libavdevice build
--disable-avcodec disable libavcodec build
--disable-avformat disable libavformat build
--disable-avutil disable libavutil build
--disable-swscale disable libswscale build
--disable-avfilter disable video filter support [no]
--disable-avresample disable libavresample build [no]
......@@ -979,6 +980,16 @@ COMPONENT_LIST="
protocols
"
LIBRARY_LIST="
avcodec
avdevice
avfilter
avformat
avresample
avutil
swscale
"
PROGRAM_LIST="
avconv
avplay
......@@ -988,12 +999,8 @@ PROGRAM_LIST="
CONFIG_LIST="
$COMPONENT_LIST
$LIBRARY_LIST
$PROGRAM_LIST
avcodec
avdevice
avfilter
avformat
avresample
avisynth
bzlib
dct
......@@ -1046,7 +1053,6 @@ CONFIG_LIST="
small
sram
static
swscale
swscale_alpha
thumb
vaapi
......@@ -1280,7 +1286,6 @@ HAVE_LIST="
CONFIG_EXTRA="
aandcttables
ac3dsp
avutil
error_resilience
gcrypt
golomb
......@@ -1729,8 +1734,12 @@ scale_filter_deps="swscale"
yadif_filter_deps="gpl"
# libraries
avdevice_deps="avcodec avformat"
avformat_deps="avcodec"
avcodec_deps="avutil"
avdevice_deps="avutil avcodec avformat"
avfilter_deps="avutil"
avformat_deps="avutil avcodec"
avresample_deps="avutil"
swscale_deps="avutil"
# programs
avconv_deps="avcodec avfilter avformat avresample swscale
......@@ -1780,15 +1789,7 @@ target_os_default=$(tolower $(uname -s))
host_os=$target_os_default
# configurable options
enable $PROGRAM_LIST
enable avcodec
enable avdevice
enable avfilter
enable avformat
enable avresample
enable avutil
enable swscale
enable $LIBRARY_LIST $PROGRAM_LIST
enable asm
enable debug
......@@ -3844,7 +3845,7 @@ SAMPLES:=${samples:-\$(LIBAV_SAMPLES)}
EOF
get_version(){
lcname=$1
lcname=lib${1}
name=$(toupper $lcname)
file=$source_path/$lcname/version.h
eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
......@@ -3853,13 +3854,7 @@ get_version(){
eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
}
get_version libavcodec
get_version libavdevice
get_version libavfilter
get_version libavformat
get_version libavresample
get_version libavutil
get_version libswscale
map 'get_version $v' $LIBRARY_LIST
cat > $TMPH <<EOF
/* Automatically generated by configure - do not modify! */
......
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