7 files changed, 84 insertions, 75 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 6ed7166ea83..7783ebec85a 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -128,7 +128,6 @@ asm_subdirs:
 		(cd x86 && $(MAKE)) || exit 1 ; \
 	fi
 	@ if echo "$(DEFINES)" | grep -q USE_X86_64_ASM ; then \
-		(cd x86 && $(MAKE)) || exit 1 ; \
 		(cd x86-64 && $(MAKE)) || exit 1 ; \
 	fi
 
diff --git a/src/mesa/x86-64/.gitignore b/src/mesa/x86-64/.gitignore
new file mode 100644
index 00000000000..ba7486c0b1a
--- /dev/null
+++ b/src/mesa/x86-64/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+gen_matypes
+matypes.h
diff --git a/src/mesa/x86-64/Makefile b/src/mesa/x86-64/Makefile
deleted file mode 100644
index 2fd3e5f04a9..00000000000
--- a/src/mesa/x86-64/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# src/mesa/x86-64/Makefile
-
-TOP = ../../..
-
-include $(TOP)/configs/current
-
-
-
-INCLUDE_DIRS = \
-	-I$(TOP)/include/GL \
-	-I$(TOP)/include \
-	-I.. \
-	-I../main \
-	-I../math \
-	-I../tnl
-
-
-default: matypes.h
-
-clean:
-	-rm -f matypes.h
-
-
-# need some special rules here, unfortunately
-matypes.h: ../main/mtypes.h ../tnl/t_context.h ../x86/gen_matypes
-	../x86/gen_matypes > matypes.h
-
-xform4.o: matypes.h
diff --git a/src/mesa/x86-64/Makefile.am b/src/mesa/x86-64/Makefile.am
new file mode 100644
index 00000000000..79cbb53cde7
--- /dev/null
+++ b/src/mesa/x86-64/Makefile.am
@@ -0,0 +1,39 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+if HAVE_X86_64_ASM
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/mesa \
+	-I$(top_srcdir)/src/mapi \
+	$(API_DEFINES) \
+	$(DEFINES)
+
+noinst_PROGRAMS = gen_matypes
+
+gen_matypes_SOURCES = ../x86/gen_matypes.c
+BUILT_SOURCES = matypes.h
+CLEANFILES = matypes.h
+
+matypes.h: gen_matypes
+	$(AM_V_GEN)./gen_matypes > $@
+
+endif
diff --git a/src/mesa/x86/.gitignore b/src/mesa/x86/.gitignore
new file mode 100644
index 00000000000..ba7486c0b1a
--- /dev/null
+++ b/src/mesa/x86/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+gen_matypes
+matypes.h
diff --git a/src/mesa/x86/Makefile b/src/mesa/x86/Makefile
deleted file mode 100644
index 81071767e1d..00000000000
--- a/src/mesa/x86/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# src/mesa/x86/Makefile
-
-TOP = ../../..
-include $(TOP)/configs/current
-
-
-INCLUDE_DIRS = \
-	-I$(TOP)/include/GL \
-	-I$(TOP)/include \
-	-I$(TOP)/src/mapi \
-	-I.. \
-	-I../main \
-	-I../math \
-	-I../tnl
-
-
-default: gen_matypes matypes.h
-
-clean:
-	-rm -f matypes.h gen_matypes
-
-
-gen_matypes: gen_matypes.c
-	$(CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
-
-# need some special rules here, unfortunately
-matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
-	./gen_matypes > matypes.h
-
-common_x86_asm.o: matypes.h
-3dnow_normal.o: matypes.h
-3dnow_xform1.o: matypes.h
-3dnow_xform2.o: matypes.h
-3dnow_xform3.o: matypes.h
-3dnow_xform4.o: matypes.h
-mmx_blend.o: matypes.h
-sse_normal.o: matypes.h
-sse_xform1.o: matypes.h
-sse_xform2.o: matypes.h
-sse_xform3.o: matypes.h
-sse_xform4.o: matypes.h
-x86_cliptest.o: matypes.h
-x86_xform2.o: matypes.h
-x86_xform3.o: matypes.h
-x86_xform4.o: matypes.h
-
diff --git a/src/mesa/x86/Makefile.am b/src/mesa/x86/Makefile.am
new file mode 100644
index 00000000000..f241de50567
--- /dev/null
+++ b/src/mesa/x86/Makefile.am
@@ -0,0 +1,39 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+if HAVE_X86_ASM
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/mesa \
+	-I$(top_srcdir)/src/mapi \
+	$(API_DEFINES) \
+	$(DEFINES)
+
+noinst_PROGRAMS = gen_matypes
+
+gen_matypes_SOURCES = gen_matypes.c
+BUILT_SOURCES = matypes.h
+CLEANFILES = matypes.h
+
+matypes.h: gen_matypes
+	$(AM_V_GEN)./gen_matypes > $@
+
+endif