Mesa (master): build: Build gen_matypes and matypes.h from src/mesa.
Matt Turner
mattst88 at kemper.freedesktop.org
Thu Nov 7 18:07:23 UTC 2013
Module: Mesa
Branch: master
Commit: fd03dd6ddd96afe782d8686fcba437d23c878da1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd03dd6ddd96afe782d8686fcba437d23c878da1
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Nov 5 13:56:14 2013 -0800
build: Build gen_matypes and matypes.h from src/mesa.
Reviewed-by: Eric Anholt <eric at anholt.net>
---
configure.ac | 4 +--
src/mesa/{x86-64 => }/.gitignore | 0
src/mesa/Makefile.am | 16 +++++++++++-
src/mesa/x86-64/Makefile.am | 49 ------------------------------------
src/mesa/x86/.gitignore | 2 -
src/mesa/x86/Makefile.am | 51 --------------------------------------
6 files changed, 16 insertions(+), 106 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0896d85..11378bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2091,9 +2091,7 @@ AC_CONFIG_FILES([Makefile
src/mesa/drivers/osmesa/osmesa.pc
src/mesa/drivers/x11/Makefile
src/mesa/main/tests/Makefile
- src/mesa/main/tests/hash_table/Makefile
- src/mesa/x86-64/Makefile
- src/mesa/x86/Makefile])
+ src/mesa/main/tests/hash_table/Makefile])
dnl Sort the dirs alphabetically
GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "`
diff --git a/src/mesa/x86-64/.gitignore b/src/mesa/.gitignore
similarity index 100%
rename from src/mesa/x86-64/.gitignore
rename to src/mesa/.gitignore
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 5f9bae2..4387415 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -19,7 +19,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-SUBDIRS = x86 x86-64 . main/tests
+SUBDIRS = . main/tests
if HAVE_X11_DRIVER
SUBDIRS += drivers/x11
@@ -98,6 +98,11 @@ AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
MESA_ASM_FILES_FOR_ARCH =
if HAVE_X86_ASM
+noinst_PROGRAMS = gen_matypes
+
+gen_matypes_SOURCES = x86/gen_matypes.c
+BUILT_SOURCES += matypes.h
+
if HAVE_X86_64_ASM
MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES)
AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64
@@ -140,6 +145,15 @@ $(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h: p
$(MKDIR_P) $(builddir)/program
$(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=$(BUILDDIR)program/program_parse.tab.c $<
+if GEN_ASM_OFFSETS
+matypes.h: $(gen_matypes_SOURCES)
+ $(AM_V_GEN)$(COMPILE) $< -DASM_OFFSETS -S -o - | \
+ sed -n '/^->/{s:^->::;/[$$]/{s:^:#define :;s:[$$]::};p}' > $@
+else
+matypes.h: gen_matypes
+ $(AM_V_GEN)./gen_matypes > $@
+endif
+
# Emacs tags
tags:
etags `find . -name \*.[ch]` $(top_srcdir)/include/GL/*.h
diff --git a/src/mesa/x86-64/Makefile.am b/src/mesa/x86-64/Makefile.am
deleted file mode 100644
index b62387d..0000000
--- a/src/mesa/x86-64/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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)/include \
- -I$(top_srcdir)/src/mesa \
- -I$(top_srcdir)/src/mapi \
- $(DEFINES)
-
-noinst_PROGRAMS = gen_matypes
-
-gen_matypes_SOURCES = ../x86/gen_matypes.c
-BUILT_SOURCES = matypes.h
-CLEANFILES = matypes.h
-
-if GEN_ASM_OFFSETS
-
-matypes.h: $(gen_matypes_SOURCES)
- $(AM_V_GEN)$(COMPILE) $< -DASM_OFFSETS -S -o - | \
- sed -n '/^->/{s:^->::;/[$$]/{s:^:#define :;s:[$$]::};p}' > $@
-
-else
-
-matypes.h: gen_matypes
- $(AM_V_GEN)./gen_matypes > $@
-
-endif
-
-endif
diff --git a/src/mesa/x86/.gitignore b/src/mesa/x86/.gitignore
deleted file mode 100644
index ca3130d..0000000
--- a/src/mesa/x86/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-gen_matypes
-matypes.h
diff --git a/src/mesa/x86/Makefile.am b/src/mesa/x86/Makefile.am
deleted file mode 100644
index 9b4a2dd..0000000
--- a/src/mesa/x86/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
-if !HAVE_X86_64_ASM
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src/mesa \
- -I$(top_srcdir)/src/mapi \
- $(DEFINES)
-
-noinst_PROGRAMS = gen_matypes
-
-gen_matypes_SOURCES = gen_matypes.c
-BUILT_SOURCES = matypes.h
-CLEANFILES = matypes.h
-
-if GEN_ASM_OFFSETS
-
-matypes.h: $(gen_matypes_SOURCES)
- $(AM_V_GEN)$(COMPILE) $< -DASM_OFFSETS -S -o - | \
- sed -n '/^->/{s:^->::;/[$$]/{s:^:#define :;s:[$$]::};p}' > $@
-
-else
-
-matypes.h: gen_matypes
- $(AM_V_GEN)./gen_matypes > $@
-
-endif
-
-endif
-endif
More information about the mesa-commit
mailing list