summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-12 14:50:05 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-12 14:50:05 +0000
commit052e870c8108bf461e54fe3e13b3b92f1456d77f (patch)
treefdb672a978481acf419c81de6df757997b538798 /Makefile
parentbac106d374d07e78a7b15ae0c185d8b5df0c34fe (diff)
downloadmpv-052e870c8108bf461e54fe3e13b3b92f1456d77f.tar.bz2
mpv-052e870c8108bf461e54fe3e13b3b92f1456d77f.tar.xz
10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17608 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 93fc6a6d95..a268518a56 100644
--- a/Makefile
+++ b/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