Author: diego Date: Tue Nov 21 13:12:19 2006 New Revision: 21125 Modified: trunk/Makefile trunk/configure Log: Merge MPlayer-specific libs into one variable. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Nov 21 13:12:19 2006 @@ -70,9 +70,8 @@ LIBS_MPLAYER = libvo/libvo.a \ libao2/libao2.a \ input/libinput.a \ + $(EXTRALIBS_MPLAYER) \ $(COMMON_LIBS) \ - $(VO_LIBS) \ - $(AO_LIBS) \ LIBS_MENCODER = libmpcodecs/libmpencoders.a \ $(EXTRA_LIB_MENCODER) \ @@ -144,7 +143,7 @@ COMMON_LIBS += $(FREETYPE_LIB) endif ifeq ($(GUI),yes) -LIBS_MPLAYER += Gui/libgui.a $(GTK_LIBS) +LIBS_MPLAYER += Gui/libgui.a PARTS += Gui endif ifeq ($(LIBMENU),yes) Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Nov 21 13:12:19 2006 @@ -7358,11 +7358,11 @@ $_ld_win32libs $_ld_lm $_ld_gif \ $_ld_vorbis $_ld_theora $_xmms_lib \ $_ld_arch -VO_LIBS = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \ +EXTRALIBS_MPLAYER = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \ $_ld_vesa $_ld_vidix_external $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm \ - $_ld_xinerama $_ld_x11 $_ld_sock -AO_LIBS = $_ld_arts $_ld_esd $_ld_jack $_ld_openal $_ld_nas $_ld_sgiaudio \ - $_ld_polyp + $_ld_xinerama $_ld_x11 $_ld_sock \ + $_ld_arts $_ld_esd $_ld_jack $_ld_openal $_ld_nas $_ld_sgiaudio $_ld_polyp \ + $_ld_static $_ld_gtk $_ld_glib EXTRA_LIB_MENCODER = $_ld_mp3lame $_ld_x264 $_toolame_lib $_twolame_lib $_ld_faac ifeq ($_lavc_faac,yes) EXTRA_LIB += $_ld_faac @@ -7375,7 +7375,6 @@ endif FREETYPE_LIB = $_ld_freetype FONTCONFIG_LIB = $_ld_fontconfig -GTK_LIBS = $_ld_static $_ld_gtk $_ld_glib HAVE_MLIB = $_mlib HAVE_PTHREADS = $_pthreads