remove relative include paths, to avoid conflicts with libtool

git-svn-id: svn://svn.videolan.org/x264/trunk@80 df754926-b1dd-0310-bc7b-ec298dee348c

Jamfile

@@ -26,8 +26,8 @@ SOURCES_C = common/mc.c common/predict.c common/pixel.c common/macroblock.c
             encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c
             encoder/encoder.c encoder/eval.c ;
 
-SOURCES_X86 = common/i386/cpu.asm ;
-SOURCES_MMX = common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c common/i386/dct.asm common/i386/pixel.asm common/i386/mc.asm ;
+SOURCES_X86 = common/i386/cpu-a.asm ;
+SOURCES_MMX = common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c common/i386/dct-a.asm common/i386/pixel-a.asm common/i386/mc-a.asm ;
 
 SOURCES_ALTIVEC = common/ppc/mc.c common/ppc/pixel.c ;
 

common/common.h

@@ -31,7 +31,7 @@
 #endif
 #include <stdarg.h>
 
-#include "../x264.h"
+#include "x264.h"
 #include "bs.h"
 #include "set.h"
 #include "predict.h"

common/cpu.c

@@ -30,7 +30,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "../x264.h"
+#include "x264.h"
 #include "cpu.h"
 
 #ifdef ARCH_X86

common/i386/dct-c.c

@@ -31,7 +31,7 @@
 
 #include "x264.h"
 
-#include "../dct.h"
+#include "common/dct.h"
 #include "dct.h"
 
 

common/i386/mc-c.c

@@ -32,8 +32,8 @@
 #include <stdarg.h>
 
 #include "x264.h"   /* DECLARE_ALIGNED */
-#include "../mc.h"
-#include "../clip1.h"
+#include "common/mc.h"
+#include "common/clip1.h"
 #include "mc.h"
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)

common/i386/predict.c

@@ -33,7 +33,7 @@
 #include <stdarg.h>
 
 #include "x264.h"   /* for keyword inline */
-#include "../predict.h"
+#include "common/predict.h"
 #include "predict.h"
 
 static inline int clip_uint8( int a )

common/mc.c

@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "../x264.h"
+#include "x264.h"
 
 #include "mc.h"
 #include "clip1.h"

common/pixel.c

@@ -30,7 +30,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "../x264.h"
+#include "x264.h"
 #include "pixel.h"
 
 #ifdef HAVE_MMXEXT

common/ppc/mc.c

@@ -32,8 +32,8 @@
 #endif
 
 #include "x264.h"
-#include "../mc.h"
-#include "../clip1.h"
+#include "common/mc.h"
+#include "common/clip1.h"
 #include "mc.h"
 #include "ppccommon.h"
 

common/ppc/pixel.c

@@ -32,7 +32,7 @@
 #endif
 
 #include "x264.h"
-#include "../pixel.h"
+#include "common/pixel.h"
 #include "pixel.h"
 #include "ppccommon.h"
 

decoder/decoder.c

@@ -26,9 +26,9 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "../common/common.h"
-#include "../common/cpu.h"
-#include "../common/vlc.h"
+#include "common/common.h"
+#include "common/cpu.h"
+#include "common/vlc.h"
 
 #include "macroblock.h"
 #include "set.h"

decoder/macroblock.c

@@ -26,8 +26,8 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "../common/common.h"
-#include "../common/vlc.h"
+#include "common/common.h"
+#include "common/vlc.h"
 #include "vlc.h"
 #include "macroblock.h"
 

decoder/set.c

@@ -26,7 +26,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "../common/common.h"
+#include "common/common.h"
 #include "set.h"
 
 /* return -1 if invalid, else the id */

decoder/vlc.c

@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-#include "../common/common.h"
-#include "../common/vlc.h"
+#include "common/common.h"
+#include "common/vlc.h"
 #include "vlc.h"
 
 

encoder/analyse.c

@@ -27,8 +27,8 @@
 #include <math.h>
 #include <limits.h>
 
-#include "../common/common.h"
-#include "../common/macroblock.h"
+#include "common/common.h"
+#include "common/macroblock.h"
 #include "macroblock.h"
 #include "me.h"
 #include "ratecontrol.h"

encoder/cabac.c

@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../common/common.h"
+#include "common/common.h"
 #include "macroblock.h"
 
 static const uint8_t block_idx_x[16] =

encoder/cavlc.c

@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../common/common.h"
-#include "../common/vlc.h"
+#include "common/common.h"
+#include "common/vlc.h"
 #include "macroblock.h"
 
 static const uint8_t intra4x4_cbp_to_golomb[48]=

encoder/encoder.c

@@ -27,8 +27,8 @@
 
 #include <math.h>
 
-#include "../common/common.h"
-#include "../common/cpu.h"
+#include "common/common.h"
+#include "common/cpu.h"
 
 #include "set.h"
 #include "analyse.h"

encoder/macroblock.c

@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../common/common.h"
+#include "common/common.h"
 #include "macroblock.h"
 
 

encoder/macroblock.h

@@ -24,7 +24,7 @@
 #ifndef _ENCODER_MACROBLOCK_H
 #define _ENCODER_MACROBLOCK_H 1
 
-#include "../common/macroblock.h"
+#include "common/macroblock.h"
 
 int x264_macroblock_probe_skip( x264_t *h, int b_bidir );
 

encoder/me.c

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../common/common.h"
+#include "common/common.h"
 #include "me.h"
 
 /* presets selected from good points on the speed-vs-quality curve of several test videos

encoder/ratecontrol.c

@@ -32,9 +32,9 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "../common/common.h"
-#include "../common/cpu.h"
-#include "../common/macroblock.h"
+#include "common/common.h"
+#include "common/cpu.h"
+#include "common/macroblock.h"
 #include "ratecontrol.h"
 
 #ifdef SYS_MACOSX

encoder/set.c

@@ -31,9 +31,9 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "../x264.h"
-#include "../common/bs.h"
-#include "../common/set.h"
+#include "x264.h"
+#include "common/bs.h"
+#include "common/set.h"
 
 void x264_sps_init( x264_sps_t *sps, int i_id, x264_param_t *param )
 {