gallium/swr: fold the almost identical Makefiles

Rather than having two almost identical Makefiles, with various VPATH
hacks just fold them, using COMMON_* variables and actually getting
things buildable/shipable.

v2: whitespace fixes, remove Makefile.sources-arch

Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Tim Rowley <[email protected]>

1 files changed, 0 insertions, 99 deletions

diff --git a/src/gallium/drivers/swr/avx/Makefile.am b/src/gallium/drivers/swr/avx/Makefile.am
deleted file mode 100644
index 384f1a7eecf..00000000000
--- a/src/gallium/drivers/swr/avx/Makefile.am
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (C) 2015 Intel Corporation.   All Rights Reserved.
-#
-# 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.
-
-include ../Makefile.sources-arch
-include $(top_srcdir)/src/gallium/Automake.inc
-
-VPATH = $(srcdir) $(srcdir)/..
-
-AM_CXXFLAGS = \
-	-march=core-avx-i \
-	-DKNOB_ARCH=KNOB_ARCH_AVX \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(LLVM_CFLAGS) \
-	-I$(builddir)/rasterizer/scripts \
-	-I$(builddir)/rasterizer/jitter \
-	-I$(srcdir)/../rasterizer \
-	-I$(srcdir)/../rasterizer/core \
-	-I$(srcdir)/../rasterizer/jitter
-
-lib_LTLIBRARIES = libswrAVX.la
-
-BUILT_SOURCES = \
-	rasterizer/scripts/gen_knobs.cpp \
-	rasterizer/scripts/gen_knobs.h \
-	rasterizer/jitter/state_llvm.h \
-	rasterizer/jitter/builder_gen.h \
-	rasterizer/jitter/builder_gen.cpp \
-	rasterizer/jitter/builder_x86.h \
-	rasterizer/jitter/builder_x86.cpp
-
-libswrAVX_la_SOURCES = \
-	$(CXX_SOURCES) \
-	$(COMMON_CXX_SOURCES) \
-	$(CORE_CXX_SOURCES) \
-	$(JITTER_CXX_SOURCES) \
-	$(MEMORY_CXX_SOURCES) \
-	$(BUILT_SOURCES)
-
-rasterizer/scripts/gen_knobs.cpp rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/../rasterizer/scripts/gen_knobs.py \
-		rasterizer/scripts
-
-rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/../rasterizer/jitter/scripts/gen_llvm_types.py \
-		--input $(srcdir)/../rasterizer/core/state.h \
-		--output rasterizer/jitter/state_llvm.h
-
-rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
-		--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
-		--output rasterizer/jitter/builder_gen.h \
-		--gen_h
-
-rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
-		--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
-		--output rasterizer/jitter/builder_gen.cpp \
-		--gen_cpp
-
-rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
-		--output rasterizer/jitter/builder_x86.h \
-		--gen_x86_h
-
-rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
-	$(PYTHON2) $(PYTHON_FLAGS) \
-		$(srcdir)/../rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
-		--output rasterizer/jitter/builder_x86.cpp \
-		--gen_x86_cpp
-
-
-libswrAVX_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/mesa/libmesagallium.la
-
-include $(top_srcdir)/install-gallium-links.mk