Mercurial > mplayer.hg

changeset 17607:156305f44337

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l
author alex
date Sun, 12 Feb 2006 14:50:05 +0000
parents 9e27eb13ef43
children cecead11dae6
files Makefile
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Feb 12 14:17:39 2006 +0000
+++ b/Makefile	Sun Feb 12 14:50:05 2006 +0000
@@ -26,10 +26,6 @@
 SUBDIRS += libdha vidix
 DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 endif
-ifeq ($(HAVE_LIBCDIO),yes)
-CFLAGS += $(LIBCDIO_INC) 
-COMMON_LIBS += $(LIBCDIO_LIB)
-endif
 
 SRCS_COMMON = asxparser.c \
               codec-cfg.c \
@@ -131,6 +127,7 @@
               $(FRIBIDI_LIB) \
               $(FONTCONFIG_LIB) \
               $(ENCA_LIB) \
+              $(LIBCDIO_LIB) \
 
 CFLAGS = $(OPTFLAGS) -I. \
          $(CACA_INC) \
@@ -144,6 +141,7 @@
          $(X11_INC) \
          $(XVID_INC) \
          $(LIBAV_INC) \
+         $(LIBCDIO_INC) \
 
 #CFLAGS += -Wall