# HG changeset patch # User diego # Date 1164029687 0 # Node ID 030c2818f7e93c65c2cbeb96596f1a7f4b5771e6 # Parent 4a7a5ce8f2120feb021c79a88f03324e27b66140 Simplify gui and menu libs handling. diff -r 4a7a5ce8f212 -r 030c2818f7e9 Makefile --- 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)