[MPlayer-cvslog] r26434 - in trunk: Makefile configure

[diego]

Author: diego
Date: Sun Apr 13 12:44:21 2008
New Revision: 26434

Log:
Add Makefile variable for DVB OSD menu, saves one ifeq.


Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sun Apr 13 12:44:21 2008
@@ -98,9 +98,6 @@ SRCS_MPLAYER = mplayer.c \
                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 @@ SRCS_MPLAYER-$(LIBMENU)      += libmenu/
                                 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

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Apr 13 12:44:21 2008
@@ -7192,8 +7192,10 @@ echores "$_byte_order"
 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 @@ VIDIX_PCIDB = $_vidix_pcidb_val
 CONFIG_POSTPROC = yes
 MP3LAME = $_mp3lame
 LIBMENU = $_menu
+LIBMENU_DVBIN = $_menu_dvbin
 
 MP3LIB = $_mp3lib
 LIBA52 = $_liba52