From b125a9e129f27424d3bc1f5225a2459c39d1a1dd Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 1 Dec 2006 01:11:42 +0000
Subject: [PATCH] Add libav include paths to CFLAGS without indirection.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile             | 8 ++++----
 libaf/Makefile       | 6 +++---
 libmpcodecs/Makefile | 7 +++----
 libmpdemux/Makefile  | 8 ++++----
 mpcommon.mak         | 2 +-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index dd10f0e164..64c9dbcd67 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 
diff --git a/libaf/Makefile b/libaf/Makefile
index bde771c39e..6175bb4dd0 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -32,10 +32,10 @@ SRCS=af.c \
 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_
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 4e61215df2..e22660db86 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -151,18 +151,17 @@ SRCS2-$(TWOLAME)              += ae_twolame.c
 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::
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 41211f5bd4..c39fbe8002 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -68,11 +68,11 @@ SRCS2 = muxer.c \
 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
 
diff --git a/mpcommon.mak b/mpcommon.mak
index ed66d463a3..093855ef8f 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -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)) )