[MPlayer-cvslog] r22605 - in trunk/libmpcodecs: Makefile ad_alaw.c ad_msgsm.c

[diego]

Author: diego
Date: Thu Mar 15 13:08:11 2007
New Revision: 22605

Modified:
   trunk/libmpcodecs/Makefile
   trunk/libmpcodecs/ad_alaw.c
   trunk/libmpcodecs/ad_msgsm.c

Log:
Use explicit header location, don't use CFLAGS for simple subdirectories.


Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Thu Mar 15 13:08:11 2007
@@ -147,8 +147,7 @@ SRCS_MENCODER-$(TWOLAME)              +=
 SRCS_MENCODER-$(MP3LAME)              += ae_lame.c
 
 
-CFLAGS  = -Inative \
-          -I../libmpdemux \
+CFLAGS  = -I../libmpdemux \
           -I../stream \
 
 CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil

Modified: trunk/libmpcodecs/ad_alaw.c
==============================================================================
--- trunk/libmpcodecs/ad_alaw.c	(original)
+++ trunk/libmpcodecs/ad_alaw.c	Thu Mar 15 13:08:11 2007
@@ -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)
 {

Modified: trunk/libmpcodecs/ad_msgsm.c
==============================================================================
--- trunk/libmpcodecs/ad_msgsm.c	(original)
+++ trunk/libmpcodecs/ad_msgsm.c	Thu Mar 15 13:08:11 2007
@@ -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)
 {