[MPlayer-cvslog] r26153 - in trunk: libmpdemux/Makefile mpcommon.mak

[diego]

Author: diego
Date: Mon Mar  3 20:37:41 2008
New Revision: 26153

Log:
Only demux_lavf.o explicitly needs -I../libavcodec in CFLAGS.
Thus there is no need to use it everywhere.


Modified:
   trunk/libmpdemux/Makefile
   trunk/mpcommon.mak

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Mon Mar  3 20:37:41 2008
@@ -66,4 +66,6 @@ SRCS_MENCODER-$(LIBAVFORMAT)           +
 
 include ../mpcommon.mak
 
+demux_lavf.o: CFLAGS += -I../libavcodec
+
 dep depend: CFLAGS += $(EXTRAXX_INC)

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Mon Mar  3 20:37:41 2008
@@ -6,7 +6,6 @@ OBJS_COMMON    += $(addsuffix .o, $(base
 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)