summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-20 13:34:47 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-20 13:34:47 +0000
commit6437823387340f40249a688b42f7881795bb3547 (patch)
tree2be6532950c1d1480f3659c1d0bd966b8e735f46 /Makefile
parente2da5057419d9fad006ed35e93881f337029821f (diff)
downloadmpv-6437823387340f40249a688b42f7881795bb3547.tar.bz2
mpv-6437823387340f40249a688b42f7881795bb3547.tar.xz
Simplify gui and menu libs handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21100 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files 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)