From e1a407256a5c1571d8f4871fd981a51cfbd46e37 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 22 Jun 2012 08:30:33 +0200
Subject: mesa xserver libxcb fontconfig

---
 mesalib/src/mesa/x86/.gitignore  |  3 +++
 mesalib/src/mesa/x86/Makefile    | 46 ----------------------------------------
 mesalib/src/mesa/x86/Makefile.am | 39 ++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 46 deletions(-)
 create mode 100644 mesalib/src/mesa/x86/.gitignore
 delete mode 100644 mesalib/src/mesa/x86/Makefile
 create mode 100644 mesalib/src/mesa/x86/Makefile.am

(limited to 'mesalib/src/mesa/x86')

diff --git a/mesalib/src/mesa/x86/.gitignore b/mesalib/src/mesa/x86/.gitignore
new file mode 100644
index 000000000..ba7486c0b
--- /dev/null
+++ b/mesalib/src/mesa/x86/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+gen_matypes
+matypes.h
diff --git a/mesalib/src/mesa/x86/Makefile b/mesalib/src/mesa/x86/Makefile
deleted file mode 100644
index 9716dc27f..000000000
--- a/mesalib/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
-	$(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_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/mesalib/src/mesa/x86/Makefile.am b/mesalib/src/mesa/x86/Makefile.am
new file mode 100644
index 000000000..f241de505
--- /dev/null
+++ b/mesalib/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
-- 
cgit v1.2.3