Mercurial > mplayer.hg

changeset 26402:08117784bc9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Makefile variable for DVB OSD menu, saves one ifeq.
author diego
date Sun, 13 Apr 2008 10:44:21 +0000
parents 617754f47828
children c7c1cc069961
files Makefile configure
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Apr 13 10:23:54 2008 +0000
+++ b/Makefile	Sun Apr 13 10:44:21 2008 +0000
@@ -98,9 +98,6 @@
                input/input.c \
 
 SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
-ifeq ($(LIBMENU), yes)
-SRCS_MPLAYER-$(DVBIN)        += libmenu/menu_dvbin.c
-endif
 SRCS_MPLAYER-$(GUI_GTK)      += gui/app.c \
                                 gui/bitmap.c \
                                 gui/cfg.c \
@@ -150,6 +147,7 @@
                                 libmenu/menu_txt.c \
                                 libmenu/vf_menu.c \
 
+SRCS_MPLAYER-$(LIBMENU_DVBIN) += libmenu/menu_dvbin.c
 SRCS_MPLAYER-$(LIRC)         += input/lirc.c
 
 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
--- a/configure	Sun Apr 13 10:23:54 2008 +0000
+++ b/configure	Sun Apr 13 10:44:21 2008 +0000
@@ -7192,8 +7192,10 @@
 echocheck "OSD menu"
 if test "$_menu" = yes ; then
     _def_menu='#define HAVE_MENU 1'
+    test $_dvbin = "yes" && _menu_dvbin=yes
 else
 _def_menu='#undef HAVE_MENU'
+    _menu_dvbin=no
 fi
 echores "$_menu"
 
@@ -7695,6 +7697,7 @@
 CONFIG_POSTPROC = yes
 MP3LAME = $_mp3lame
 LIBMENU = $_menu
+LIBMENU_DVBIN = $_menu_dvbin
 
 MP3LIB = $_mp3lib
 LIBA52 = $_liba52