[MPlayer-cvslog] CVS: main Makefile,1.339,1.340

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv19630

Modified Files:
	Makefile 
Log Message:
10l

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- Makefile	12 Feb 2006 08:03:58 -0000	1.339
+++ Makefile	12 Feb 2006 14:50:05 -0000	1.340
@@ -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