comparison configure @ 19190:1ea5c31932fd

Unify include paths in the build system, part I.
author diego
date Thu, 27 Jul 2006 10:08:17 +0000
parents 0506fc913c27
children 727c334a1c44
comparison
equal deleted inserted replaced
19189:0506fc913c27 19190:1ea5c31932fd
7336 HOST_CC = $_host_cc 7336 HOST_CC = $_host_cc
7337 AWK = $_awk 7337 AWK = $_awk
7338 RANLIB = $_ranlib 7338 RANLIB = $_ranlib
7339 INSTALL = $_install 7339 INSTALL = $_install
7340 # FIXME: Should only be $_inc_extra, time to get rid of all --with-fooincdir. 7340 # FIXME: Should only be $_inc_extra, time to get rid of all --with-fooincdir.
7341 EXTRA_INC = $_inc_extra $_inc_libdts $_inc_mlib 7341 EXTRA_INC = $_inc_extra $_inc_libdts $_inc_mlib $_inc_x11 $_inc_dxr2 $_inc_dvb \
7342 $_inc_caca $_inc_arts $_inc_esd $_inc_polyp $_inc_jack $_inc_openal\
7343 $_inc_sdl $_inc_xvid $_inc_x264 $_inc_directfb $_inc_cdparanoia \
7344 $_inc_freetype $_inc_fontconfig $_inc_fribidi $_inc_libcdio $_inc_gtk
7342 OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC) 7345 OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
7343 STRIPBINARIES = $_stripbinaries 7346 STRIPBINARIES = $_stripbinaries
7344 CHARSET = $_charset 7347 CHARSET = $_charset
7345 HELP_FILE = $_mp_help 7348 HELP_FILE = $_mp_help
7346 7349
7386 ENCA_LIB = $_ld_enca 7389 ENCA_LIB = $_ld_enca
7387 HAVE_PTHREADS = $_pthreads 7390 HAVE_PTHREADS = $_pthreads
7388 MATH_LIB = $_ld_lm 7391 MATH_LIB = $_ld_lm
7389 LIBC_LIB = $_ld_libC 7392 LIBC_LIB = $_ld_libC
7390 7393
7391 X11_INC = $_inc_x11
7392 X11DIR = $_ld_x11 7394 X11DIR = $_ld_x11
7393 7395
7394 HAVE_XVMC_ACCEL = $_xvmc 7396 HAVE_XVMC_ACCEL = $_xvmc
7395 7397
7396 # for FFmpeg 7398 # for FFmpeg
7401 7403
7402 # video output 7404 # video output
7403 X_LIB = $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm $_ld_xinerama $_ld_x11 $_ld_sock 7405 X_LIB = $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm $_ld_xinerama $_ld_x11 $_ld_sock
7404 GGI_LIB = $_ld_ggi 7406 GGI_LIB = $_ld_ggi
7405 MLIB_LIB = $_ld_mlib 7407 MLIB_LIB = $_ld_mlib
7406 DXR2_INC = $_inc_dxr2
7407 DVB_INC = $_inc_dvb
7408 PNG_LIB = $_ld_png 7408 PNG_LIB = $_ld_png
7409 JPEG_LIB = $_ld_jpeg 7409 JPEG_LIB = $_ld_jpeg
7410 GIF_LIB = $_ld_gif 7410 GIF_LIB = $_ld_gif
7411 SDL_LIB = $_ld_sdl 7411 SDL_LIB = $_ld_sdl
7412 SVGA_LIB = $_ld_svga 7412 SVGA_LIB = $_ld_svga
7413 VESA_LIB = $_ld_vesa 7413 VESA_LIB = $_ld_vesa
7414 AA_LIB = $_ld_aa 7414 AA_LIB = $_ld_aa
7415 CACA_INC = $_inc_caca
7416 CACA_LIB = $_ld_caca 7415 CACA_LIB = $_ld_caca
7417 7416
7418 # audio output 7417 # audio output
7419 OSS = $_ossaudio 7418 OSS = $_ossaudio
7420 ALSA = $_alsa 7419 ALSA = $_alsa
7422 ALSA9 = $_alsa9 7421 ALSA9 = $_alsa9
7423 ALSA1X = $_alsa1x 7422 ALSA1X = $_alsa1x
7424 ALSA_LIB = $_ld_alsa 7423 ALSA_LIB = $_ld_alsa
7425 NAS_LIB = $_ld_nas 7424 NAS_LIB = $_ld_nas
7426 ARTS_LIB = $_ld_arts 7425 ARTS_LIB = $_ld_arts
7427 ARTS_INC = $_inc_arts
7428 ESD_LIB = $_ld_esd 7426 ESD_LIB = $_ld_esd
7429 ESD_INC = $_inc_esd
7430 POLYP_LIB = $_ld_polyp 7427 POLYP_LIB = $_ld_polyp
7431 POLYP_INC = $_inc_polyp
7432 JACK_LIB = $_ld_jack 7428 JACK_LIB = $_ld_jack
7433 JACK_INC = $_inc_jack
7434 OPENAL_LIB = $_ld_openal 7429 OPENAL_LIB = $_ld_openal
7435 OPENAL_INC = $_inc_openal
7436 SGIAUDIO_LIB = $_ld_sgiaudio 7430 SGIAUDIO_LIB = $_ld_sgiaudio
7437 7431
7438 # input/demuxer/codecs 7432 # input/demuxer/codecs
7439 TERMCAP_LIB = $_ld_termcap 7433 TERMCAP_LIB = $_ld_termcap
7440 LIRC_LIB = $_ld_lirc 7434 LIRC_LIB = $_ld_lirc
7450 DVDREAD = $_dvdread 7444 DVDREAD = $_dvdread
7451 DVDREAD_LIB = $_ld_dvdread 7445 DVDREAD_LIB = $_ld_dvdread
7452 DVDKIT2 = $_mpdvdkit 7446 DVDKIT2 = $_mpdvdkit
7453 DVDNAV = $_dvdnav 7447 DVDNAV = $_dvdnav
7454 DVDNAV_LIB = $_ld_dvdnav 7448 DVDNAV_LIB = $_ld_dvdnav
7455 SDL_INC = $_inc_sdl
7456 WIN32DLL = $_win32 7449 WIN32DLL = $_win32
7457 W32_DEP = $_dep_win32 7450 W32_DEP = $_dep_win32
7458 W32_LIB = $_ld_win32 7451 W32_LIB = $_ld_win32
7459 QTX_CODECS = $_qtx 7452 QTX_CODECS = $_qtx
7460 REAL_CODECS = $_real 7453 REAL_CODECS = $_real
7474 FAME_LIB = $_ld_libfame 7467 FAME_LIB = $_ld_libfame
7475 LIBDV = $_libdv 7468 LIBDV = $_libdv
7476 ARCH_LIB = $_ld_arch $_ld_iconv 7469 ARCH_LIB = $_ld_arch $_ld_iconv
7477 XVID = $_xvid 7470 XVID = $_xvid
7478 XVID4 = $_xvid4 7471 XVID4 = $_xvid4
7479 XVID_INC = $_inc_xvid
7480 XVID_LIB = $_ld_xvid 7472 XVID_LIB = $_ld_xvid
7481 X264 = $_x264 7473 X264 = $_x264
7482 X264_INC = $_inc_x264
7483 X264_LIB = $_ld_x264 7474 X264_LIB = $_ld_x264
7484 CONFIG_DTS = $_libdts 7475 CONFIG_DTS = $_libdts
7485 DTS_LIB = $_ld_libdts 7476 DTS_LIB = $_ld_libdts
7486 DECORE_LIB = $_ld_mp3lame 7477 DECORE_LIB = $_ld_mp3lame
7487 MENCODER = $_mencoder 7478 MENCODER = $_mencoder
7488 ENCORE_LIB = $_ld_mp3lame 7479 ENCORE_LIB = $_ld_mp3lame
7489 DIRECTFB_INC = $_inc_directfb
7490 DIRECTFB_LIB = $_ld_directfb 7480 DIRECTFB_LIB = $_ld_directfb
7491 CDDA = $_cdda 7481 CDDA = $_cdda
7492 CDPARANOIA_INC = $_inc_cdparanoia
7493 CDPARANOIA_LIB = $_ld_cdparanoia 7482 CDPARANOIA_LIB = $_ld_cdparanoia
7494 FREETYPE = $_freetype 7483 FREETYPE = $_freetype
7495 FREETYPE_INC = $_inc_freetype
7496 FREETYPE_LIB = $_ld_freetype 7484 FREETYPE_LIB = $_ld_freetype
7497 FONTCONFIG_INC = $_inc_fontconfig
7498 FONTCONFIG_LIB = $_ld_fontconfig 7485 FONTCONFIG_LIB = $_ld_fontconfig
7499 CONFIG_ASS = $_ass 7486 CONFIG_ASS = $_ass
7500 FRIBIDI_INC = $_inc_fribidi
7501 FRIBIDI_LIB = $_ld_fribidi 7487 FRIBIDI_LIB = $_ld_fribidi
7502 LIBCDIO_INC = $_inc_libcdio
7503 LIBCDIO_LIB = $_ld_libcdio 7488 LIBCDIO_LIB = $_ld_libcdio
7504 LIBLZO_LIB= $_ld_liblzo 7489 LIBLZO_LIB= $_ld_liblzo
7505 LIBMAD = $_mad 7490 LIBMAD = $_mad
7506 MAD_LIB = $_ld_mad 7491 MAD_LIB = $_ld_mad
7507 LIBVORBIS = $_vorbis 7492 LIBVORBIS = $_vorbis
7557 TARGET_VIS = $_vis 7542 TARGET_VIS = $_vis
7558 TARGET_BUILTIN_VECTOR = $_builtin_vector 7543 TARGET_BUILTIN_VECTOR = $_builtin_vector
7559 TARGET_BUILTIN_3DNOW = $_mm3dnow 7544 TARGET_BUILTIN_3DNOW = $_mm3dnow
7560 7545
7561 # --- GUI stuff --- 7546 # --- GUI stuff ---
7562 GTK_INC = $_inc_gtk
7563 GTKLIB = $_ld_gtk 7547 GTKLIB = $_ld_gtk
7564 GLIBLIB = $_ld_glib 7548 GLIBLIB = $_ld_glib
7565 GTK_LIBS = $_ld_static \$(GTKLIB) \$(GLIBLIB) 7549 GTK_LIBS = $_ld_static \$(GTKLIB) \$(GLIBLIB)
7566 GUI = $_gui 7550 GUI = $_gui
7567 7551