Merge MPlayer-specific libs into one variable.

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

2 files changed, 6 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index e7f3dd6d26..a4172b06b3 100644
--- a/Makefile
+++ b/Makefile
@@ -70,9 +70,8 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
 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 @@ ifeq ($(FREETYPE),yes)
 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)
diff --git a/configure b/configure
index cb0f55519e..7567ee199f 100755
--- a/configure
+++ b/configure
@@ -7358,11 +7358,11 @@ EXTRA_LIB = $_ld_extra \
   $_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 @@ EXTRA_LIB += $_ld_x264
 endif
 FREETYPE_LIB = $_ld_freetype
 FONTCONFIG_LIB = $_ld_fontconfig
-GTK_LIBS = $_ld_static $_ld_gtk $_ld_glib
 
 HAVE_MLIB = $_mlib
 HAVE_PTHREADS = $_pthreads