From 6437823387340f40249a688b42f7881795bb3547 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Nov 2006 13:34:47 +0000 Subject: [PATCH] Simplify gui and menu libs handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21100 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8457ae1d6c..de2a52683f 100644 --- a/Makefile +++ b/Makefile @@ -77,8 +77,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \ 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 @@ COMMON_LIBS += $(FREETYPE_LIB) 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)