# HG changeset patch # User diego # Date 1204573061 0 # Node ID 752e406375510b48b0c0f1ab458ea66c23698b4d # Parent 24ba95d881811465bd8d97c124ee2a8859635574 Only demux_lavf.o explicitly needs -I../libavcodec in CFLAGS. Thus there is no need to use it everywhere. diff -r 24ba95d88181 -r 752e40637551 libmpdemux/Makefile --- a/libmpdemux/Makefile Mon Mar 03 19:32:15 2008 +0000 +++ b/libmpdemux/Makefile Mon Mar 03 19:37:41 2008 +0000 @@ -66,4 +66,6 @@ include ../mpcommon.mak +demux_lavf.o: CFLAGS += -I../libavcodec + dep depend: CFLAGS += $(EXTRAXX_INC) diff -r 24ba95d88181 -r 752e40637551 mpcommon.mak --- a/mpcommon.mak Mon Mar 03 19:32:15 2008 +0000 +++ b/mpcommon.mak Mon Mar 03 19:37:41 2008 +0000 @@ -6,7 +6,6 @@ OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) ) OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) -CFLAGS-$(LIBAVCODEC) += -I../libavcodec CFLAGS += $(CFLAGS-yes) $(OPTFLAGS) LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER)