[MPlayer-cvslog] r21100 - trunk/Makefile

[diego]

Author: diego
Date: Mon Nov 20 14:34:47 2006
New Revision: 21100

Modified:
   trunk/Makefile

Log:
Simplify gui and menu libs handling.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Nov 20 14:34:47 2006
@@ -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)