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

[diego]

Author: diego
Date: Fri Dec  1 02:11:42 2006
New Revision: 21406

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

Log:
Add libav include paths to CFLAGS without indirection.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Fri Dec  1 02:11:42 2006
@@ -6,11 +6,11 @@
 
 include config.mak
 
-LIBAV_INC-$(CONFIG_LIBAVUTIL)  += -I./libavutil
-LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I./libavcodec
-LIBAV_INC                      += $(LIBAV_INC-yes)
+CFLAGS = $(OPTFLAGS) -I.
 
-CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC)
+CFLAGS-$(CONFIG_LIBAVUTIL)  += -I./libavutil
+CFLAGS-$(CONFIG_LIBAVCODEC) += -I./libavcodec
+CFLAGS                      += $(CFLAGS-yes)
 
 #CFLAGS += -Wall
 

Modified: trunk/libaf/Makefile
==============================================================================
--- trunk/libaf/Makefile	(original)
+++ trunk/libaf/Makefile	Fri Dec  1 02:11:42 2006
@@ -32,10 +32,10 @@
 SRCS-$(CONFIG_LIBAVCODEC)    += af_lavcresample.c
 SRCS-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c
 
-LIBAV_INC-$(CONFIG_LIBAVUTIL)  += -I../libavutil
-LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec
+CFLAGS  = -D_GNU_SOURCE
 
-CFLAGS  = $(LIBAV_INC) -D_GNU_SOURCE
+CFLAGS-$(CONFIG_LIBAVUTIL)   += -I../libavutil
+CFLAGS-$(CONFIG_LIBAVCODEC)  += -I../libavcodec
 
 ifeq ($(TARGET_OS),MINGW32)
 CFLAGS += -D_IO_H_

Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Fri Dec  1 02:11:42 2006
@@ -151,18 +151,17 @@
 SRCS2-$(MP3LAME)              += ae_lame.c
 
 
-LIBAV_INC-$(CONFIG_LIBAVUTIL)  +=  -I../libavutil
-LIBAV_INC-$(CONFIG_LIBAVCODEC) +=  -I../libavcodec
-
 # -I.. to include ../liba52 before ../libavcodec/liba52.
 CFLAGS  = -I.. \
           -Inative \
           -I../libmpdemux \
           -I../stream \
           -I../loader \
-          $(LIBAV_INC) \
           -D_GNU_SOURCE \
 
+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	Fri Dec  1 02:11:42 2006
@@ -68,11 +68,11 @@
 SRCS2-$(CONFIG_LIBAVFORMAT)     += muxer_lavf.c
 SRCS2-$(CONFIG_LIBAVFORMAT_SO)  += muxer_lavf.c
 
-LIBAV_INC-$(CONFIG_LIBAVUTIL)   += -I../libavutil
-LIBAV_INC-$(CONFIG_LIBAVCODEC)  += -I../libavcodec
-LIBAV_INC-$(CONFIG_LIBAVFORMAT) += -I../libavformat
+CFLAGS = -I../stream -I../loader
 
-CFLAGS = -I../stream -I../loader $(LIBAV_INC)
+CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
+CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
+CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
 
 CPLUSPLUSFLAGS  = $(CFLAGS) -D__STDC_LIMIT_MACROS
 

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Fri Dec  1 02:11:42 2006
@@ -1,6 +1,6 @@
 SRCS         += $(SRCS-yes)
 SRCS2        += $(SRCS2-yes)
-LIBAV_INC    += $(LIBAV_INC-yes)
+CFLAGS       += $(CFLAGS-yes)
 
 OBJS  = $(addsuffix .o, $(basename $(SRCS)) )
 OBJS2 = $(addsuffix .o, $(basename $(SRCS2)) )