From 5f92d2613236c15f3a7ada30fa7eebfc92c44be9 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 15 Mar 2007 12:08:11 +0000
Subject: Use explicit header location, don't use CFLAGS for simple
 subdirectories.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22605 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/Makefile   | 3 +--
 libmpcodecs/ad_alaw.c  | 2 +-
 libmpcodecs/ad_msgsm.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'libmpcodecs')

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 17f7c756b9..ce1bc99295 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -147,8 +147,7 @@ SRCS_MENCODER-$(TWOLAME)              += ae_twolame.c
 SRCS_MENCODER-$(MP3LAME)              += ae_lame.c
 
 
-CFLAGS  = -Inative \
-          -I../libmpdemux \
+CFLAGS  = -I../libmpdemux \
           -I../stream \
 
 CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil
diff --git a/libmpcodecs/ad_alaw.c b/libmpcodecs/ad_alaw.c
index 69a1be0536..0085b12f85 100644
--- a/libmpcodecs/ad_alaw.c
+++ b/libmpcodecs/ad_alaw.c
@@ -16,7 +16,7 @@ static ad_info_t info =
 
 LIBAD_EXTERN(alaw)
 
-#include "alaw.h"
+#include "native/alaw.h"
 
 static int init(sh_audio_t *sh_audio)
 {
diff --git a/libmpcodecs/ad_msgsm.c b/libmpcodecs/ad_msgsm.c
index ace6f47e5a..c558595656 100644
--- a/libmpcodecs/ad_msgsm.c
+++ b/libmpcodecs/ad_msgsm.c
@@ -16,7 +16,7 @@ static ad_info_t info =
 
 LIBAD_EXTERN(msgsm)
 
-#include "xa_gsm.h"
+#include "native/xa_gsm.h"
 
 static int init(sh_audio_t *sh_audio)
 {
-- 
cgit v1.2.3