Treat video output objects the same as everything else in the build system,

i.e. have lines that conditionally enable each in the Makefile and
corresponding variables set from configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28080 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 32 insertions, 45 deletions

diff --git a/configure b/configure
index 900f832254..7d12116cd8 100755
--- a/configure
+++ b/configure
@@ -3633,7 +3633,6 @@ EOF
     _ld_extra="$_ld_extra -framework Carbon -framework QuickTime"
     _quartz=yes
     _def_quartz='#define CONFIG_QUARTZ 1'
-    _vosrc="$_vosrc vo_quartz.c"
     _vomodules="quartz $_vomodules"
     _def_quicktime='#define CONFIG_QUICKTIME 1'
   else
@@ -3648,7 +3647,6 @@ cat > $TMPC <<EOF
 int main(void) { return 0; }
 EOF
 	if cc_check -framework Carbon -framework QuartzCore -framework OpenGL; then
-		_vosrc="$_vosrc vo_macosx.m"
 		_vomodules="macosx $_vomodules"
 		_ld_extra="$_ld_extra -framework Cocoa -framework QuartzCore -framework OpenGL"
 		_def_corevideo='#define CONFIG_COREVIDEO 1'
@@ -3796,7 +3794,6 @@ echores "$_smb"
 echocheck "tdfxfb"
 if test "$_tdfxfb" = yes ; then
   _def_tdfxfb='#define CONFIG_TDFXFB 1'
-  _vosrc="$_vosrc vo_tdfxfb.c"
   _vomodules="tdfxfb $_vomodules"
 else
   _def_tdfxfb='#undef CONFIG_TDFXFB'
@@ -3807,7 +3804,6 @@ echores "$_tdfxfb"
 echocheck "s3fb"
 if test "$_s3fb" = yes ; then
   _def_s3fb='#define CONFIG_S3FB 1'
-  _vosrc="$_vosrc vo_s3fb.c"
   _vomodules="s3fb $_vomodules"
 else
   _def_s3fb='#undef CONFIG_S3FB'
@@ -3818,7 +3814,6 @@ echores "$_s3fb"
 echocheck "wii"
 if test "$_wii" = yes ; then
   _def_wii='#define CONFIG_WII 1'
-  _vosrc="$_vosrc vo_wii.c"
   _vomodules="wii $_vomodules"
 else
   _def_wii='#undef CONFIG_WII'
@@ -3829,7 +3824,6 @@ echores "$_wii"
 echocheck "tdfxvid"
 if test "$_tdfxvid" = yes ; then
   _def_tdfxvid='#define CONFIG_TDFX_VID 1'
-  _vosrc="$_vosrc vo_tdfx_vid.c"
   _vomodules="tdfx_vid $_vomodules"
 else
   _def_tdfxvid='#undef CONFIG_TDFX_VID'
@@ -3856,7 +3850,6 @@ EOF
 fi
 if test "$_xvr100" = yes ; then
   _def_xvr100='#define CONFIG_XVR100 1'
-  _vosrc="$_vosrc vo_xvr100.c"
   _vomodules="xvr100 $_vomodules"
 else
   _def_tdfxvid='#undef CONFIG_XVR100'
@@ -3867,7 +3860,6 @@ echores "$_xvr100"
 echocheck "tga"
 if test "$_tga" = yes ; then
   _def_tga='#define CONFIG_TGA 1'
-  _vosrc="$_vosrc vo_tga.c"
   _vomodules="tga $_vomodules"
 else
   _def_tga='#undef CONFIG_TGA'
@@ -3879,7 +3871,6 @@ echores "$_tga"
 echocheck "md5sum support"
 if test "$_md5sum" = yes; then
   _def_md5sum="#define CONFIG_MD5SUM"
-  _vosrc="$_vosrc vo_md5sum.c"
   _vomodules="md5sum $_vomodules"
 else
   _def_md5sum="#undef CONFIG_MD5SUM"
@@ -3891,7 +3882,6 @@ echores "$_md5sum"
 echocheck "yuv4mpeg support"
 if test "$_yuv4mpeg" = yes; then
   _def_yuv4mpeg="#define CONFIG_YUV4MPEG"
-  _vosrc="$_vosrc vo_yuv4mpeg.c"
   _vomodules="yuv4mpeg $_vomodules"
 else
   _def_yuv4mpeg="#undef CONFIG_YUV4MPEG"
@@ -3903,7 +3893,6 @@ echores "$_yuv4mpeg"
 echocheck "bl"
 if test "$_bl" = yes ; then
   _def_bl='#define CONFIG_BL 1'
-  _vosrc="$_vosrc vo_bl.c"
   _vomodules="bl $_vomodules"
 else
   _def_bl='#undef CONFIG_BL'
@@ -3961,7 +3950,6 @@ echores "$_directfb"
 
 if test "$_directfb" = yes ; then
   _def_directfb='#define CONFIG_DIRECTFB 1'
-  _vosrc="$_vosrc vo_directfb2.c"
   _vomodules="directfb $_vomodules"
   _libs_mplayer="$_libs_mplayer -ldirectfb"
 else
@@ -3969,7 +3957,6 @@ else
   _novomodules="directfb $_novomodules"
 fi
 if test "$_dfbmga" = yes; then
-  _vosrc="$_vosrc vo_dfbmga.c"
   _vomodules="dfbmga $_vomodules"
   _def_dfbmga='#define CONFIG_DFBMGA 1'
 else
@@ -4021,7 +4008,6 @@ EOF
 fi
 if test "$_x11" = yes ; then
   _def_x11='#define CONFIG_X11 1'
-  _vosrc="$_vosrc x11_common.c vo_x11.c vo_xover.c"
   _vomodules="x11 xover $_vomodules"
 else
   _x11=no
@@ -4103,7 +4089,6 @@ fi
 if test "$_xv" = yes ; then
   _def_xv='#define CONFIG_XV 1'
   _libs_mplayer="$_libs_mplayer -lXv"
-  _vosrc="$_vosrc vo_xv.c"
   _vomodules="xv $_vomodules"
 else
   _def_xv='#undef CONFIG_XV'
@@ -4131,7 +4116,6 @@ fi
 if test "$_xvmc" = yes ; then
   _def_xvmc='#define HAVE_XVMC 1'
   _libs_mplayer="$_libs_mplayer -lXvMC -l$_xvmclib"
-  _vosrc="$_vosrc vo_xvmc.c"
   _vomodules="xvmc $_vomodules"
   _res_comment="using $_xvmclib"
 else
@@ -4242,7 +4226,6 @@ fi
 if test "$_dga" = yes ; then
   _def_dga='#define CONFIG_DGA 1'
   _libs_mplayer="$_libs_mplayer -lXxf86dga"
-  _vosrc="$_vosrc vo_dga.c"
   _vomodules="dga $_vomodules"
 else
   _novomodules="dga $_novomodules"
@@ -4253,7 +4236,6 @@ echores "$_dga"
 echocheck "3dfx"
 if test "$_3dfx" = yes && test "$_dga" = yes ; then
   _def_3dfx='#define CONFIG_3DFX 1'
-  _vosrc="$_vosrc vo_3dfx.c"
   _vomodules="3dfx $_vomodules"
 else
   _def_3dfx='#undef CONFIG_3DFX'
@@ -4302,10 +4284,8 @@ else
 fi
 if test "$_gl" = yes ; then
   _def_gl='#define CONFIG_GL 1'
-  _vosrc="$_vosrc vo_gl.c vo_gl2.c gl_common.c"
   if test "$_gl_win32" = yes ; then
     _def_gl_win32='#define GL_WIN32 1'
-    _vosrc="$_vosrc w32_common.c"
     _res_comment="win32 version"
   fi
   _vomodules="opengl $_vomodules"
@@ -4359,7 +4339,6 @@ echores "$_vidix"
 
 if test "$_vidix" = yes ; then
   _def_vidix='#define CONFIG_VIDIX 1'
-  _vosrc="$_vosrc vo_cvidix.c"
   _vomodules="cvidix $_vomodules"
   test "$_vidix_drivers" || _vidix_drivers="cyberblade ivtv mach64 mga mga_crtc2 nvidia pm2 pm3 radeon rage128 s3 sh_veu sis unichrome"
   test $_ivtv = "yes" || _vidix_drivers=`echo $_vidix_drivers | sed s/ivtv//`
@@ -4395,14 +4374,14 @@ else
 fi
 
 if test "$_vidix" = yes && win32; then
-  _vosrc="$_vosrc vo_winvidix.c"
+  winvidix=yes
   _vomodules="winvidix $_vomodules"
   _libs_mplayer="$_libs_mplayer -lgdi32"
 else
   _novomodules="winvidix $_novomodules"
 fi
 if test "$_vidix" = yes && test "$_x11" = yes; then
-  _vosrc="$_vosrc vo_xvidix.c"
+  xvidix=yes
   _vomodules="xvidix $_vomodules"
 else
   _novomodules="xvidix $_novomodules"
@@ -4415,7 +4394,6 @@ if test "$_mga" = auto ; then
 fi
 if test "$_mga" = yes ; then
   _def_mga='#define CONFIG_MGA 1'
-  _vosrc="$_vosrc vo_mga.c"
   _vomodules="mga $_vomodules"
 else
   _def_mga='#undef CONFIG_MGA'
@@ -4431,7 +4409,6 @@ if test "$_xmga" = auto ; then
 fi
 if test "$_xmga" = yes ; then
   _def_xmga='#define CONFIG_XMGA 1'
-  _vosrc="$_vosrc vo_xmga.c"
   _vomodules="xmga $_vomodules"
 else
   _def_xmga='#undef CONFIG_XMGA'
@@ -4452,7 +4429,6 @@ fi
 if test "$_ggi" = yes ; then
   _def_ggi='#define CONFIG_GGI 1'
   _libs_mplayer="$_libs_mplayer -lggi"
-  _vosrc="$_vosrc vo_ggi.c"
   _vomodules="ggi $_vomodules"
 else
   _def_ggi='#undef CONFIG_GGI'
@@ -4507,7 +4483,6 @@ if test "$_aa" = yes ; then
   if cygwin ; then
     _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`"
   fi
-  _vosrc="$_vosrc vo_aa.c"
   _vomodules="aa $_vomodules"
 else
   _def_aa='#undef CONFIG_AA'
@@ -4534,7 +4509,6 @@ if test "$_caca" = yes ; then
   _def_caca='#define CONFIG_CACA 1'
   _inc_extra="$_inc_extra `caca-config --cflags`"
   _libs_mplayer="$_libs_mplayer `caca-config --libs`"
-  _vosrc="$_vosrc vo_caca.c"
   _vomodules="caca $_vomodules"
 else
   _def_caca='#undef CONFIG_CACA'
@@ -4555,7 +4529,6 @@ fi
 if test "$_svga" = yes ; then
   _def_svga='#define CONFIG_SVGALIB 1'
   _libs_mplayer="$_libs_mplayer -lvga"
-  _vosrc="$_vosrc vo_svga.c"
   _vomodules="svga $_vomodules"
 else
   _def_svga='#undef CONFIG_SVGALIB'
@@ -4571,7 +4544,6 @@ if test "$_fbdev" = auto ; then
 fi
 if test "$_fbdev" = yes ; then
   _def_fbdev='#define CONFIG_FBDEV 1'
-  _vosrc="$_vosrc vo_fbdev.c vo_fbdev2.c"
   _vomodules="fbdev $_vomodules"
 else
   _def_fbdev='#undef CONFIG_FBDEV'
@@ -4689,7 +4661,6 @@ echores "$_png"
 if test "$_png" = yes ; then
   _def_png='#define CONFIG_PNG 1'
   _ld_extra="$_ld_extra -lpng -lz"
-  _vosrc="$_vosrc vo_png.c"
   _vomodules="png $_vomodules"
 else
   _def_png='#undef CONFIG_PNG'
@@ -4739,7 +4710,6 @@ echores "$_jpeg"
 
 if test "$_jpeg" = yes ; then
   _def_jpeg='#define CONFIG_JPEG 1'
-  _vosrc="$_vosrc vo_jpeg.c"
   _vomodules="jpeg $_vomodules"
   _ld_extra="$_ld_extra -ljpeg"
 else
@@ -4752,7 +4722,6 @@ fi
 echocheck "PNM support"
 if test "$_pnm" = yes; then
   _def_pnm="#define CONFIG_PNM 1"
-  _vosrc="$_vosrc vo_pnm.c"
   _vomodules="pnm $_vomodules"
 else
   _def_pnm="#undef CONFIG_PNM"
@@ -4798,7 +4767,6 @@ fi
 
 if test "$_gif" = yes ; then
   _def_gif='#define CONFIG_GIF 1'
-  _vosrc="$_vosrc vo_gif89a.c"
   _codecmodules="gif $_codecmodules"
   _vomodules="gif89a $_vomodules"
   _res_comment="old version, some encoding functions disabled"
@@ -4863,7 +4831,6 @@ fi
 if test "$_vesa" = yes ; then
   _def_vesa='#define CONFIG_VESA 1'
   _libs_mplayer="$_libs_mplayer -lvbe -llrmi"
-  _vosrc="$_vosrc vo_vesa.c vesa_lvo.c gtf.c"
   _vomodules="vesa $_vomodules"
 else
   _def_vesa='#undef CONFIG_VESA'
@@ -4921,7 +4888,6 @@ if test "$_sdl" = yes ; then
     _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs`"
     _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//`"
   fi
-  _vosrc="$_vosrc vo_sdl.c"
   _vomodules="sdl $_vomodules"
   _aomodules="sdl $_aomodules"
   _res_comment="using $_sdlconfig"
@@ -4968,7 +4934,6 @@ fi
 if test "$_direct3d" = yes ; then
   _def_direct3d='#define CONFIG_DIRECT3D 1'
   _libs_mplayer="$_libs_mplayer -ld3d9"
-  _vosrc="$_vosrc vo_direct3d.c w32_common.c"
   _vomodules="direct3d $_vomodules"
 else
   _def_direct3d='#undef CONFIG_DIRECT3D'
@@ -4990,7 +4955,6 @@ fi
 if test "$_directx" = yes ; then
   _def_directx='#define CONFIG_DIRECTX 1'
   _libs_mplayer="$_libs_mplayer -lgdi32"
-  _vosrc="$_vosrc vo_directx.c"
   _vomodules="directx $_vomodules"
   _aomodules="dsound $_aomodules"
 else
@@ -5036,7 +5000,6 @@ EOF
 fi
 if test "$_dxr2" = yes; then
   _def_dxr2='#define CONFIG_DXR2 1'
-  _vosrc="$_vosrc vo_dxr2.c"
   _aomodules="dxr2 $_aomodules"
   _vomodules="dxr2 $_vomodules"
 else
@@ -5057,7 +5020,6 @@ EOF
 fi
 if test "$_dxr3" = yes ; then
   _def_dxr3='#define CONFIG_DXR3 1'
-  _vosrc="$_vosrc vo_dxr3.c"
   _vomodules="dxr3 $_vomodules"
 else
   _def_dxr3='#undef CONFIG_DXR3'
@@ -5087,7 +5049,6 @@ EOF
 fi
 if test "$_ivtv" = yes ; then
   _def_ivtv='#define CONFIG_IVTV 1'
-  _vosrc="$_vosrc vo_ivtv.c"
   _vomodules="ivtv $_vomodules"
   _aomodules="ivtv $_aomodules"
 else
@@ -5121,7 +5082,6 @@ EOF
 fi
 if test "$_v4l2" = yes ; then
   _def_v4l2='#define CONFIG_V4L2_DECODER 1'
-  _vosrc="$_vosrc vo_v4l2.c"
   _vomodules="v4l2 $_vomodules"
   _aomodules="v4l2 $_aomodules"
 else
@@ -6971,7 +6931,6 @@ fi
 if test "$_zr" = yes ; then
   if test "$_libavcodec_a" = yes ; then
     _def_zr='#define CONFIG_ZR 1'
-    _vosrc="$_vosrc vo_zr2.c vo_zr.c jpeg_enc.c"
     _vomodules="zr zr2 $_vomodules"
   else
     _res_comment="libavcodec (static) is required by zr, sorry"
@@ -7945,8 +7904,6 @@ GETCH = $_getch
 HELP_FILE = $_mp_help
 TIMER = $_timer
 
-VO_SRCS = $_vosrc
-
 EXESUF = $_exesuf
 
 $_target_arch
@@ -7966,6 +7923,8 @@ NEED_SWAB    = $_need_swab
 NEED_VSSCANF = $_need_vsscanf
 
 # features
+3DFX = $_3dfx
+AA = $_aa
 ALSA1X = $_alsa1x
 ALSA9 = $_alsa9
 ALSA5 = $_alsa5
@@ -7974,23 +7933,34 @@ APPLE_REMOTE = $_apple_remote
 ARTS = $_arts
 AUDIO_INPUT = $_audio_input
 BITMAP_FONT = $_bitmap_font
+BL = $_bl
+CACA = $_caca
 CDDA = $_cdda
 CDDB = $_cddb
 COREAUDIO = $_coreaudio
 COREVIDEO = $_corevideo
+DFBMGA = $_dfbmga
+DGA = $_dga
+DIRECT3D = $_direct3d
+DIRECTFB = $_directfb
 DIRECTX = $_directx
 DVBIN = $_dvbin
 DVDNAV = $_dvdnav
 DVDREAD = $_dvdread
 DVDREAD_INTERNAL = $_dvdread_internal
 DXR2 = $_dxr2
+DXR3 = $_dxr3
 ESD = $_esd
 FAAC=$_faac
 FAAD = $_faad
 FAAD_INTERNAL = $_faad_internal
+FBDEV = $_fbdev
 FREETYPE = $_freetype
 FTP = $_ftp
 GIF = $_gif
+GGI = $_ggi
+GL = $_gl
+GL_WIN32 = $_gl_win32
 GUI = $_gui
 GUI_GTK = $_gui_gtk
 GUI_WIN32 = $_gui_win32
@@ -8022,6 +7992,8 @@ LIRC = $_lirc
 LIVE555 = $_live
 MACOSX_BUNDLE = $_macosx_bundle
 MACOSX_FINDER = $_macosx_finder
+MD5SUM = $_md5sum
+MGA = $_mga
 MNG = $_mng
 MP3LAME = $_mp3lame
 MP3LIB = $_mp3lib
@@ -8033,6 +8005,7 @@ OPENAL = $_openal
 OSS = $_ossaudio
 PE_EXECUTABLE = $_pe_executable
 PNG = $_png
+PNM = $_pnm
 PULSE = $_pulse
 PVR = $_pvr
 QTX_CODECS = $_qtx
@@ -8042,11 +8015,16 @@ QUARTZ = $_quartz
 RADIO=$_radio
 RADIO_CAPTURE=$_radio_capture
 REAL_CODECS = $_real
+S3FB = $_s3fb
 SDL = $_sdl
 SPEEX = $_speex
 STREAM_CACHE = $_stream_cache
 SGIAUDIO = $_sgiaudio
 SUNAUDIO = $_sunaudio
+SVGA = $_svga
+TDFXFB = $_tdfxfb
+TDFXVID = $_tdfxvid
+TGA = $_tga
 TOOLAME=$_toolame
 TREMOR_INTERNAL = $_tremor_internal
 TV = $_tv
@@ -8060,6 +8038,7 @@ TWOLAME=$_twolame
 UNRAR_EXEC = $_unrar_exec
 V4L2 = $_v4l2
 VCD = $_vcd
+VESA = $_vesa
 VIDIX = $_vidix
 VIDIX_PCIDB = $_vidix_pcidb_val
 VIDIX_CYBERBLADE=$_vidix_drv_cyberblade
@@ -8077,13 +8056,21 @@ VIDIX_SH_VEU=$_vidix_drv_sh_veu
 VIDIX_SIS=$_vidix_drv_sis
 VIDIX_UNICHROME=$_vidix_drv_unichrome
 VSTREAM = $_vstream
+WII = $_wii
 WIN32DLL = $_win32dll
 WIN32WAVEOUT = $_win32waveout
 WIN32_EMULATION = $_win32_emulation
+WINVIDIX = $winvidix
+X11 = $_x11
 X264 = $_x264
 XANIM_CODECS = $_xanim
+XMGA = $_xmga
 XMMS_PLUGINS = $_xmms
+XV = $_xv
 XVID4 = $_xvid
+XVIDIX = $xvidix
+XVMC = $_xvmc
+YUV4MPEG = $_yuv4mpeg
 ZR = $_zr
 
 # FFmpeg