remove relative include paths, to avoid conflicts with libtool

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

diff --git a/Jamfile b/Jamfile
index b7771bce2c7ce9bb2bf8e30453b981852b692dcf..c17c2e939f09b02bbcd07cbe85406cec001b8b7e 100644 (file)
--- a/Jamfile
+++ b/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 ;
 

diff --git a/common/common.h b/common/common.h
index 19ddd1b82653f9d196cd480caa30c599e745de9e..dfbfc8be21c7340f78de4dee5c102c02d6d31348 100644 (file)
--- a/common/common.h
+++ b/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"

diff --git a/common/cpu.c b/common/cpu.c
index a39c42712ad771ab8c16626c24ad3c5b6864e9ce..499a076148f080317e115eb597c74fdb7839677e 100644 (file)
--- a/common/cpu.c
+++ b/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

diff --git a/common/i386/dct-c.c b/common/i386/dct-c.c
index adba948021bfa2d15f312a7f57dedfa80f392ea6..4527903565335e2cf65dd85f5f1c7c4567ab74a3 100644 (file)
--- a/common/i386/dct-c.c
+++ b/common/i386/dct-c.c
@@ -31,7 +31,7 @@
 
 #include "x264.h"
 
-#include "../dct.h"
+#include "common/dct.h"
 #include "dct.h"
 
 

diff --git a/common/i386/mc-c.c b/common/i386/mc-c.c
index e2e9251b5f56ab54cf0612f2c405ded6b6e5a503..424f18eedae77694343bfd204fd346a99676b89e 100644 (file)
--- a/common/i386/mc-c.c
+++ b/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)

diff --git a/common/i386/predict.c b/common/i386/predict.c
index febb4a2e2769812b751a5a38e0fa173f29a486f8..b0a0b7b7c64d231e3040832c2f3d69507295fa45 100644 (file)
--- a/common/i386/predict.c
+++ b/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 )

diff --git a/common/mc.c b/common/mc.c
index 5eb94c4f19e22dfaf54c50b541aa795ecfb5e7c3..870b0fac42ade629c1292e30cc93875af1833b24 100644 (file)
--- a/common/mc.c
+++ b/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"

diff --git a/common/pixel.c b/common/pixel.c
index d0001b1b4072ca023da764b706eccdc7aba8f360..89af666b0a596f58aeaa07be003ce85ca58fa336 100644 (file)
--- a/common/pixel.c
+++ b/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

diff --git a/common/ppc/mc.c b/common/ppc/mc.c
index b96d3e3efe8146ef42a46d98af195b6523a7b7af..901d285e5840963db699913390c303876ebe55fb 100644 (file)
--- a/common/ppc/mc.c
+++ b/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"
 

diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c
index a6d048fc5a6ba398c1e7666b9b9e2a68dbee6bea..de822e7fc2cf7309e59ba07994458c0827ec56ce 100644 (file)
--- a/common/ppc/pixel.c
+++ b/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"
 

diff --git a/decoder/decoder.c b/decoder/decoder.c
index fa47454d0becbc3370ffd9421395fc6cf23011be..57bace52f5736d808fe8e4ca9e04a69bfe483a04 100644 (file)
--- a/decoder/decoder.c
+++ b/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"

diff --git a/decoder/macroblock.c b/decoder/macroblock.c
index 55e8ea4bc8efd23fc67b6967ec94d74ee9daf93c..7ab7375060886f4f26dc088c4599b6e4515cdecc 100644 (file)
--- a/decoder/macroblock.c
+++ b/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"
 

diff --git a/decoder/set.c b/decoder/set.c
index e3f10aff3b205d113574d8f1a504fc1f9637b34f..10e079666015a36707baceded8876242d6d36958 100644 (file)
--- a/decoder/set.c
+++ b/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 */

diff --git a/decoder/vlc.c b/decoder/vlc.c
index dc7f8d7e63d01a2c76fe5b9c8493d9f99352fd83..f7535f63606c10000d91c1c367b63d7b8c48c014 100644 (file)
--- a/decoder/vlc.c
+++ b/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"
 
 

diff --git a/encoder/analyse.c b/encoder/analyse.c
index 667058a9bbac25712af793c10613b1f471d88553..3d98f41b9a80954a65a00e42197cc55de79a0631 100644 (file)
--- a/encoder/analyse.c
+++ b/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"

diff --git a/encoder/cabac.c b/encoder/cabac.c
index f30af96c7a667b5b67f6c0fcd08700fe03a84f6c..762ea3414479707a6cd348c7f6be5bdceddae086 100644 (file)
--- a/encoder/cabac.c
+++ b/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] =

diff --git a/encoder/cavlc.c b/encoder/cavlc.c
index 95c5db68498b7da6a9e46427960d9b968e345ee8..f1df9a2938ff4c89e6129678daf85711c263679d 100644 (file)
--- a/encoder/cavlc.c
+++ b/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]=

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 378371bfa5f26b035fccef4fcec5f64841684e76..2be43d5a2888edcf55aef5fa27b3667b8a162fd7 100644 (file)
--- a/encoder/encoder.c
+++ b/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"

diff --git a/encoder/macroblock.c b/encoder/macroblock.c
index 514b83a8038e97d9a34353c2019dc94df39c4775..d07f04029fca062cac8cf5f14434a4ee043ebd29 100644 (file)
--- a/encoder/macroblock.c
+++ b/encoder/macroblock.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../common/common.h"
+#include "common/common.h"
 #include "macroblock.h"
 
 

diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index 4310c2e5d21bdd01945c824d11c29507562f2c01..6c8768aec07733d6861322786054a588f901e0ea 100644 (file)
--- a/encoder/macroblock.h
+++ b/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 );
 

diff --git a/encoder/me.c b/encoder/me.c
index fee0756c08acc7974df8799b841ca2d574e1e61c..b865a2092a46536a40b038861238ab1ed97b76d5 100644 (file)
--- a/encoder/me.c
+++ b/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

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index c33525aaaed60d7282ad57db86feeb36317c2f9c..0fa92a3140221bd0f00eb12e26b5de12e97ccf4a 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/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

diff --git a/encoder/set.c b/encoder/set.c
index 1a23bda16000221e2926948b6ad53ff658e58dd6..9b9278f7b31d78733c030d7d136a944ab48b4298 100644 (file)
--- a/encoder/set.c
+++ b/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 )
 {