[MPlayer-cvslog] r26400 - trunk/Makefile

uau subversion at mplayerhq.hu
Sat Apr 12 01:06:30 CEST 2008


Author: uau
Date: Sat Apr 12 01:06:30 2008
New Revision: 26400

Log:
Makefile: Fix compilation on systems with dvb support

libmenu/menu_dvbin.c was added to sources if HAVE_DVBIN was defined,
even if LIBMENU was not defined. This caused a compilation failure on
systems with dvb support unless you ran configure with --enable-menu.
Fix by making compilation of menu_dvbin conditional on both HAVE_DVBIN
and LIBMENU.


Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sat Apr 12 01:06:30 2008
@@ -98,7 +98,9 @@ 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 \



More information about the MPlayer-cvslog mailing list