mesa: Remove assyntax.h include from generated matypes.h.

matypes.h doesn't really depend on assyntax.h; assyntax.h is only present
on x86; and this way we remove the need of grep being available (which is
relevant for scons and non-unix platforms).

diff --git a/src/mesa/x86-64/Makefile b/src/mesa/x86-64/Makefile
index 252218c..ab58aa6 100644 (file)
--- 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 693a786..7f5f6b3 100644 (file)
--- a/src/mesa/x86/3dnow_normal.S
+++ b/src/mesa/x86/3dnow_normal.S
@@ -29,6 +29,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 7665c0f..a73301a 100644 (file)
--- a/src/mesa/x86/3dnow_xform1.S
+++ b/src/mesa/x86/3dnow_xform1.S
@@ -24,6 +24,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 b201d1e..2988fb7 100644 (file)
--- a/src/mesa/x86/3dnow_xform2.S
+++ b/src/mesa/x86/3dnow_xform2.S
@@ -24,6 +24,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 46f1556..a356aae 100644 (file)
--- a/src/mesa/x86/3dnow_xform3.S
+++ b/src/mesa/x86/3dnow_xform3.S
@@ -24,6 +24,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 a0c6b19..b2b7c64 100644 (file)
--- a/src/mesa/x86/3dnow_xform4.S
+++ b/src/mesa/x86/3dnow_xform4.S
@@ -24,6 +24,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 e95f3d4..afb4b11 100644 (file)
--- 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 20ac5a2..eeaf43e 100644 (file)
--- 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 1c32e3b..a8c0d38 100644 (file)
--- a/src/mesa/x86/sse_normal.S
+++ b/src/mesa/x86/sse_normal.S
@@ -31,6 +31,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 22fd8dd..4aa9de6 100644 (file)
--- a/src/mesa/x86/sse_xform1.S
+++ b/src/mesa/x86/sse_xform1.S
@@ -31,6 +31,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 52eeb27..91b82e7 100644 (file)
--- a/src/mesa/x86/sse_xform2.S
+++ b/src/mesa/x86/sse_xform2.S
@@ -31,6 +31,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 5e0cd8b..1fc79ef 100644 (file)
--- a/src/mesa/x86/sse_xform3.S
+++ b/src/mesa/x86/sse_xform3.S
@@ -31,6 +31,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 1368052..fb1fa74 100644 (file)
--- a/src/mesa/x86/sse_xform4.S
+++ b/src/mesa/x86/sse_xform4.S
@@ -24,6 +24,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 c7a3a9b..e413aee 100644 (file)
--- a/src/mesa/x86/x86_cliptest.S
+++ b/src/mesa/x86/x86_cliptest.S
@@ -29,6 +29,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 e41661d..980725e 100644 (file)
--- a/src/mesa/x86/x86_xform2.S
+++ b/src/mesa/x86/x86_xform2.S
@@ -29,6 +29,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 067ddd7..1c782f1 100644 (file)
--- a/src/mesa/x86/x86_xform3.S
+++ b/src/mesa/x86/x86_xform3.S
@@ -29,6 +29,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 77621ac..97a8411 100644 (file)
--- a/src/mesa/x86/x86_xform4.S
+++ b/src/mesa/x86/x86_xform4.S
@@ -29,6 +29,7 @@
  * in there will break the build on some platforms.
  */
 
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"