[MPlayer-cvslog] r22735 - in trunk: Gui/Makefile libaf/Makefile libmpcodecs/Makefile libmpdemux/Makefile libvo/Makefile mpcommon.mak

[diego]

Author: diego
Date: Sun Mar 18 23:49:37 2007
New Revision: 22735

Modified:
   trunk/Gui/Makefile
   trunk/libaf/Makefile
   trunk/libmpcodecs/Makefile
   trunk/libmpdemux/Makefile
   trunk/libvo/Makefile
   trunk/mpcommon.mak

Log:
Move libav* include CFLAGS to mpcommon.mak instead of duplicating them.


Modified: trunk/Gui/Makefile
==============================================================================
--- trunk/Gui/Makefile	(original)
+++ trunk/Gui/Makefile	Sun Mar 18 23:49:37 2007
@@ -4,8 +4,6 @@ LIBNAME_MPLAYER = libgui.a
 
 #CFLAGS += -DDEBUG
 
-CFLAGS-$(CONFIG_LIBAVUTIL)   += -I../libavutil
-
 ifeq ($(TARGET_WIN32),yes)
 SRCS_MPLAYER = win32/dialogs.c \
                win32/gui.c \

Modified: trunk/libaf/Makefile
==============================================================================
--- trunk/libaf/Makefile	(original)
+++ trunk/libaf/Makefile	Sun Mar 18 23:49:37 2007
@@ -32,9 +32,6 @@ SRCS_COMMON = af.c \
 SRCS_COMMON-$(CONFIG_LIBAVCODEC)    += af_lavcresample.c
 SRCS_COMMON-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c
 
-CFLAGS-$(CONFIG_LIBAVUTIL)   += -I../libavutil
-CFLAGS-$(CONFIG_LIBAVCODEC)  += -I../libavcodec
-
 ifeq ($(TARGET_OS),MINGW32)
 CFLAGS += -D_IO_H_
 endif

Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Sun Mar 18 23:49:37 2007
@@ -147,9 +147,6 @@ SRCS_MENCODER-$(TWOLAME)              +=
 SRCS_MENCODER-$(MP3LAME)              += ae_lame.c
 
 
-CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil
-CFLAGS-$(CONFIG_LIBAVCODEC)   +=  -I../libavcodec
-
 include ../mpcommon.mak
 
 clean::

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Sun Mar 18 23:49:37 2007
@@ -65,8 +65,4 @@ SRCS_MENCODER = muxer.c \
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT)     += muxer_lavf.c
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO)  += muxer_lavf.c
 
-CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
-CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
-CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
-
 include ../mpcommon.mak

Modified: trunk/libvo/Makefile
==============================================================================
--- trunk/libvo/Makefile	(original)
+++ trunk/libvo/Makefile	Sun Mar 18 23:49:37 2007
@@ -22,6 +22,4 @@ SRCS_COMMON = aclib.c \
 SRCS_COMMON-$(BITMAP_FONT) +=  font_load.c
 SRCS_COMMON-$(FREETYPE)    +=  font_load_ft.c
 
-CFLAGS-$(CONFIG_LIBAVUTIL) +=  -I../libavutil
-
 include ../mpcommon.mak

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Sun Mar 18 23:49:37 2007
@@ -6,6 +6,9 @@ OBJS_COMMON    = $(addsuffix .o, $(basen
 OBJS_MPLAYER   = $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
 OBJS_MENCODER  = $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
 
+CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
+CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
+CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
 CFLAGS += $(CFLAGS-yes) -I. -I.. $(OPTFLAGS)
 
 LIBS-$(MPLAYER)  += $(LIBNAME_MPLAYER)