From 19a7b5869b9fefe1ea1a6e058bca82fda839a508 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 15 Nov 2005 18:14:07 +0000
Subject: Unify include paths, -I.. is in CFLAGS.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16990 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp3lib/dct36_3dnow.c | 2 +-
 mp3lib/dct64_3dnow.c | 4 ++--
 mp3lib/dct64_MMX.c   | 2 +-
 mp3lib/dct64_k7.c    | 4 ++--
 mp3lib/decod386.c    | 2 +-
 mp3lib/decode_MMX.c  | 4 ++--
 mp3lib/decode_i586.c | 4 ++--
 mp3lib/mpg123.h      | 2 +-
 mp3lib/sr1.c         | 8 ++++----
 mp3lib/tabinit_MMX.c | 4 ++--
 mp3lib/test.c        | 2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'mp3lib')

diff --git a/mp3lib/dct36_3dnow.c b/mp3lib/dct36_3dnow.c
index 52ed54f2f8..c0c55d974e 100644
--- a/mp3lib/dct36_3dnow.c
+++ b/mp3lib/dct36_3dnow.c
@@ -29,7 +29,7 @@
 
 #define real float /* ugly - but only way */
 
-#include "../mangle.h"
+#include "mangle.h"
 
 #ifdef __DCT36_OPTIMIZE_FOR_K7
 void dct36_3dnowex(real *inbuf, real *o1,
diff --git a/mp3lib/dct64_3dnow.c b/mp3lib/dct64_3dnow.c
index 420f2086eb..f957e9ce65 100644
--- a/mp3lib/dct64_3dnow.c
+++ b/mp3lib/dct64_3dnow.c
@@ -9,8 +9,8 @@
 */
 #define real float /* ugly - but only way */
 
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 
 static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float attribute_used plus_1f = 1.0;
diff --git a/mp3lib/dct64_MMX.c b/mp3lib/dct64_MMX.c
index aafa8890e1..2014c0fcde 100644
--- a/mp3lib/dct64_MMX.c
+++ b/mp3lib/dct64_MMX.c
@@ -3,7 +3,7 @@
 * See ChangeLog of mpg123-0.59s-pre.1 for detail
 * Applied to mplayer by Nick Kurshev <nickols_k@mail.ru>
 */
-#include "../mangle.h"
+#include "mangle.h"
 #define real float /* ugly - but only way */
 
 void dct64_MMX(real *a,real *b,real *c)
diff --git a/mp3lib/dct64_k7.c b/mp3lib/dct64_k7.c
index 95fe61bc26..09bb162aab 100644
--- a/mp3lib/dct64_k7.c
+++ b/mp3lib/dct64_k7.c
@@ -9,8 +9,8 @@
 */
 #define real float /* ugly - but only way */
 
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 
 static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float attribute_used plus_1f = 1.0;
diff --git a/mp3lib/decod386.c b/mp3lib/decod386.c
index 4095b3e1c1..5d03979359 100644
--- a/mp3lib/decod386.c
+++ b/mp3lib/decod386.c
@@ -17,7 +17,7 @@
  */
 
 
-#include "../config.h"
+#include "config.h"
 
 #if 0
  /* old WRITE_SAMPLE */
diff --git a/mp3lib/decode_MMX.c b/mp3lib/decode_MMX.c
index 990e56305c..ee53885d25 100644
--- a/mp3lib/decode_MMX.c
+++ b/mp3lib/decode_MMX.c
@@ -7,8 +7,8 @@
  * Local ChangeLog:
  * - Partial loops unrolling and removing MOVW insn from loops
 */
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 #define real float /* ugly - but only way */
 
 static unsigned long long attribute_used __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
diff --git a/mp3lib/decode_i586.c b/mp3lib/decode_i586.c
index 7c24c1aba2..b884619480 100644
--- a/mp3lib/decode_i586.c
+++ b/mp3lib/decode_i586.c
@@ -29,8 +29,8 @@
 *
 * $Id$
 */
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 #define real float /* ugly - but only way */
 
 static long attribute_used buffs[1088]={0};
diff --git a/mp3lib/mpg123.h b/mp3lib/mpg123.h
index 787eceaa51..2aace4e783 100644
--- a/mp3lib/mpg123.h
+++ b/mp3lib/mpg123.h
@@ -9,7 +9,7 @@
  * used source: musicout.h from mpegaudio package
  */
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef M_PI
 #define M_PI		3.141592653589793238462
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index a3f7b292b1..87ab7dc4b7 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -25,9 +25,9 @@
 #include "huffman.h"
 #include "mp3.h"
 #include "bswap.h"
-#include "../cpudetect.h"
-//#include "../liba52/mm_accel.h"
-#include "../mp_msg.h"
+#include "cpudetect.h"
+//#include "liba52/mm_accel.h"
+#include "mp_msg.h"
 
 #include "fastmemcpy.h"
 
@@ -394,7 +394,7 @@ extern void dct64_MMX_3dnow(real *, real *, real *);
 extern void dct64_MMX_3dnowex(real *, real *, real *);
 void (*dct64_MMX_func)(real *, real *, real *);
 
-#include "../cpudetect.h"
+#include "cpudetect.h"
 
 // Init decoder tables.  Call first, once!
 #ifdef USE_FAKE_MONO
diff --git a/mp3lib/tabinit_MMX.c b/mp3lib/tabinit_MMX.c
index ff7026c260..312b298321 100644
--- a/mp3lib/tabinit_MMX.c
+++ b/mp3lib/tabinit_MMX.c
@@ -3,8 +3,8 @@
  * See ChangeLog of mpg123-0.59s-pre.1 for detail
  * Applied to mplayer by Nick Kurshev <nickols_k@mail.ru>
 */
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 
 long __attribute__((aligned(8))) mp3lib_decwins [544];
 
diff --git a/mp3lib/test.c b/mp3lib/test.c
index 81dc675a6a..1a96e9b909 100644
--- a/mp3lib/test.c
+++ b/mp3lib/test.c
@@ -12,7 +12,7 @@
 #include "mp3lib/mp3.h"
 #include "config.h"
 
-#include "../cpudetect.h"
+#include "cpudetect.h"
 extern CpuCaps gCpuCaps;
 
 static inline unsigned int GetTimer(){
-- 
cgit v1.2.3