10l

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17608 b3059339-0415-0410-9bf9-f77b7e298cf2

Makefile

@@ -26,10 +26,6 @@ ifeq ($(VIDIX),yes)
 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 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
               $(FRIBIDI_LIB) \
               $(FONTCONFIG_LIB) \
               $(ENCA_LIB) \
+              $(LIBCDIO_LIB) \
 
 CFLAGS = $(OPTFLAGS) -I. \
          $(CACA_INC) \
@@ -144,6 +141,7 @@ CFLAGS = $(OPTFLAGS) -I. \
          $(X11_INC) \
          $(XVID_INC) \
          $(LIBAV_INC) \
+         $(LIBCDIO_INC) \
 
 #CFLAGS += -Wall