Mercurial > mplayer.hg

diff Makefile @ 21084:030c2818f7e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify gui and menu libs handling.
author diego
date Mon, 20 Nov 2006 13:34:47 +0000
parents 4a7a5ce8f212
children 6a152d4ee3ae
line wrap: on
line diff
--- a/Makefile	Mon Nov 20 13:00:26 2006 +0000
+++ b/Makefile	Mon Nov 20 13:34:47 2006 +0000
@@ -77,8 +77,6 @@
 LIBS_MPLAYER = libvo/libvo.a \
                libao2/libao2.a \
                input/libinput.a \
-               $(MENU_LIBS) \
-               $(GUI_LIBS) \
                $(COMMON_LIBS) \
                $(VO_LIBS) \
                $(AO_LIBS) \
@@ -175,12 +173,12 @@
 endif
 ifeq ($(GUI),yes)
 COMMON_DEPS += Gui/libgui.a
-GUI_LIBS = Gui/libgui.a $(GTK_LIBS)
+LIBS_MPLAYER += Gui/libgui.a $(GTK_LIBS)
 PARTS += Gui
 endif
 ifeq ($(LIBMENU),yes)
 MPLAYER_DEP += libmenu/libmenu.a
-MENU_LIBS = libmenu/libmenu.a
+LIBS_MPLAYER += libmenu/libmenu.a
 PARTS += libmenu
 endif
 ifeq ($(TARGET_WIN32),yes)