17 files changed, 17 insertions, 3 deletions
diff --git a/src/mesa/x86-64/Makefile b/src/mesa/x86-64/Makefile
index c6b69bafe8..9c3e9d2adf 100644
--- a/src/mesa/x86-64/Makefile
+++ b/src/mesa/x86-64/Makefile
@@ -24,6 +24,6 @@ clean:
 
 # need some special rules here, unfortunately
 matypes.h: ../main/mtypes.h ../tnl/t_context.h ../x86/gen_matypes
-	../x86/gen_matypes | grep -v '#include "assyntax.h' > matypes.h
+	../x86/gen_matypes > matypes.h
 
 xform4.o: matypes.h
diff --git a/src/mesa/x86/3dnow_normal.S b/src/mesa/x86/3dnow_normal.S
index f3bbcb27b7..63177779d4 100644
--- a/src/mesa/x86/3dnow_normal.S
+++ b/src/mesa/x86/3dnow_normal.S
@@ -30,6 +30,7 @@
 
 #ifdef USE_3DNOW_ASM
 
+#include "assyntax.h"
 #include "matypes.h"
 #include "norm_args.h"
 
diff --git a/src/mesa/x86/3dnow_xform1.S b/src/mesa/x86/3dnow_xform1.S
index 22b12cca06..fc8d79f29c 100644
--- a/src/mesa/x86/3dnow_xform1.S
+++ b/src/mesa/x86/3dnow_xform1.S
@@ -25,6 +25,7 @@
  */
 
 #ifdef USE_3DNOW_ASM
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/3dnow_xform2.S b/src/mesa/x86/3dnow_xform2.S
index d9e96d04e2..639f5d9b8b 100644
--- a/src/mesa/x86/3dnow_xform2.S
+++ b/src/mesa/x86/3dnow_xform2.S
@@ -25,6 +25,7 @@
  */
 
 #ifdef USE_3DNOW_ASM
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/3dnow_xform3.S b/src/mesa/x86/3dnow_xform3.S
index babee1caa0..f6c1259b2b 100644
--- a/src/mesa/x86/3dnow_xform3.S
+++ b/src/mesa/x86/3dnow_xform3.S
@@ -25,6 +25,7 @@
  */
 
 #ifdef USE_3DNOW_ASM
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/3dnow_xform4.S b/src/mesa/x86/3dnow_xform4.S
index b16d2b12dd..1183f2fda8 100644
--- a/src/mesa/x86/3dnow_xform4.S
+++ b/src/mesa/x86/3dnow_xform4.S
@@ -25,6 +25,7 @@
  */
 
 #ifdef USE_3DNOW_ASM
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c
index e95f3d4f3d..afb4b11529 100644
--- a/src/mesa/x86/gen_matypes.c
+++ b/src/mesa/x86/gen_matypes.c
@@ -92,7 +92,6 @@ int main( int argc, char **argv )
    printf( "#ifndef __ASM_TYPES_H__\n" );
    printf( "#define __ASM_TYPES_H__\n" );
    printf( "\n" );
-   printf( "#include \"assyntax.h\"\n" );
 
 
    /* GLcontext offsets:
diff --git a/src/mesa/x86/mmx_blend.S b/src/mesa/x86/mmx_blend.S
index 20ac5a20ad..eeaf43ea93 100644
--- a/src/mesa/x86/mmx_blend.S
+++ b/src/mesa/x86/mmx_blend.S
@@ -1,10 +1,11 @@
 	;
 /*
- * Written by Jos� Fonseca <j_r_fonseca@yahoo.co.uk>
+ * Written by Jos� Fonseca <j_r_fonseca@yahoo.co.uk>
  */
 
 
 #ifdef USE_MMX_ASM
+#include "assyntax.h"
 #include "matypes.h"
 
 /* integer multiplication - alpha plus one
diff --git a/src/mesa/x86/sse_normal.S b/src/mesa/x86/sse_normal.S
index 066d46e5ef..6ca997dbab 100644
--- a/src/mesa/x86/sse_normal.S
+++ b/src/mesa/x86/sse_normal.S
@@ -32,6 +32,7 @@
   */
 
 #ifdef USE_SSE_ASM
+#include "assyntax.h"
 #include "matypes.h"
 #include "norm_args.h"
 
diff --git a/src/mesa/x86/sse_xform1.S b/src/mesa/x86/sse_xform1.S
index 4051f606a7..6ee699a343 100644
--- a/src/mesa/x86/sse_xform1.S
+++ b/src/mesa/x86/sse_xform1.S
@@ -32,6 +32,7 @@
   */
 
 #ifdef USE_SSE_ASM
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/sse_xform2.S b/src/mesa/x86/sse_xform2.S
index 06fe086bd4..5583e4683d 100644
--- a/src/mesa/x86/sse_xform2.S
+++ b/src/mesa/x86/sse_xform2.S
@@ -32,6 +32,7 @@
   */
 
 #ifdef USE_SSE_ASM
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/sse_xform3.S b/src/mesa/x86/sse_xform3.S
index eafbe34288..cea9368d1f 100644
--- a/src/mesa/x86/sse_xform3.S
+++ b/src/mesa/x86/sse_xform3.S
@@ -32,6 +32,7 @@
   */
 
 #ifdef USE_SSE_ASM
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/sse_xform4.S b/src/mesa/x86/sse_xform4.S
index 24c323194f..6d0161b8b9 100644
--- a/src/mesa/x86/sse_xform4.S
+++ b/src/mesa/x86/sse_xform4.S
@@ -25,6 +25,7 @@
  */
 
 #ifdef USE_SSE_ASM
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/x86_cliptest.S b/src/mesa/x86/x86_cliptest.S
index 5a45ee6ae6..adf6aeb29f 100644
--- a/src/mesa/x86/x86_cliptest.S
+++ b/src/mesa/x86/x86_cliptest.S
@@ -30,6 +30,7 @@
  * in there will break the build on some platforms.
  */
 
+#include "assyntax.h"
 #include "matypes.h"
 #include "clip_args.h"
 
diff --git a/src/mesa/x86/x86_xform2.S b/src/mesa/x86/x86_xform2.S
index 94f6989d42..b26a480ea0 100644
--- a/src/mesa/x86/x86_xform2.S
+++ b/src/mesa/x86/x86_xform2.S
@@ -30,6 +30,7 @@
  * in there will break the build on some platforms.
  */
 
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/x86_xform3.S b/src/mesa/x86/x86_xform3.S
index 747e2f4d28..c2bdee98ea 100644
--- a/src/mesa/x86/x86_xform3.S
+++ b/src/mesa/x86/x86_xform3.S
@@ -30,6 +30,7 @@
  * in there will break the build on some platforms.
  */
 
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
diff --git a/src/mesa/x86/x86_xform4.S b/src/mesa/x86/x86_xform4.S
index def3c1ceb9..f62a0d0d7d 100644
--- a/src/mesa/x86/x86_xform4.S
+++ b/src/mesa/x86/x86_xform4.S
@@ -30,6 +30,7 @@
  * in there will break the build on some platforms.
  */
 
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"