summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-21 12:12:19 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-21 12:12:19 +0000
commit43c4abaf0cfe48092dc15fc4dabc531c1b7b9876 (patch)
tree67cd60370d795a7c7a2694a31f1ed1eeaf61b739 /Makefile
parent406f7d342db6349db47201d34e94f05702ad4f3b (diff)
downloadmpv-43c4abaf0cfe48092dc15fc4dabc531c1b7b9876.tar.bz2
mpv-43c4abaf0cfe48092dc15fc4dabc531c1b7b9876.tar.xz
Merge MPlayer-specific libs into one variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21125 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 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)