amd: flatten amd/common makefile structure
This pulls amd/common build rules into upper level makefile, along with amd/addlib which is already there. v2: [Emil Velikov] - Move NEED_RADEON_LLVM conditional, drop amd/common from SUBDIRS - Drop AM_ from common_libamd_common_la* Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
74e39de932
commit
95ed2d9d2c
|
@ -2685,7 +2685,6 @@ dnl Substitute the config
|
||||||
AC_CONFIG_FILES([Makefile
|
AC_CONFIG_FILES([Makefile
|
||||||
src/Makefile
|
src/Makefile
|
||||||
src/amd/Makefile
|
src/amd/Makefile
|
||||||
src/amd/common/Makefile
|
|
||||||
src/amd/vulkan/Makefile
|
src/amd/vulkan/Makefile
|
||||||
src/compiler/Makefile
|
src/compiler/Makefile
|
||||||
src/egl/Makefile
|
src/egl/Makefile
|
||||||
|
|
|
@ -78,10 +78,6 @@ if HAVE_AMD_DRIVERS
|
||||||
SUBDIRS += amd
|
SUBDIRS += amd
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if NEED_RADEON_LLVM
|
|
||||||
SUBDIRS += amd/common
|
|
||||||
endif
|
|
||||||
|
|
||||||
if HAVE_INTEL_DRIVERS
|
if HAVE_INTEL_DRIVERS
|
||||||
SUBDIRS += intel
|
SUBDIRS += intel
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -25,3 +25,4 @@ noinst_LTLIBRARIES =
|
||||||
|
|
||||||
EXTRA_DIST = $(COMMON_HEADER_FILES)
|
EXTRA_DIST = $(COMMON_HEADER_FILES)
|
||||||
include Makefile.addrlib.am
|
include Makefile.addrlib.am
|
||||||
|
include Makefile.common.am
|
||||||
|
|
|
@ -19,15 +19,18 @@
|
||||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
# IN THE SOFTWARE.
|
# IN THE SOFTWARE.
|
||||||
|
|
||||||
include Makefile.sources
|
if NEED_RADEON_LLVM
|
||||||
|
|
||||||
|
COMMON_LIBS = common/libamd_common.la
|
||||||
|
|
||||||
# TODO cleanup these
|
# TODO cleanup these
|
||||||
AM_CPPFLAGS = \
|
common_libamd_common_la_CPPFLAGS = \
|
||||||
$(VALGRIND_CFLAGS) \
|
$(VALGRIND_CFLAGS) \
|
||||||
$(DEFINES) \
|
$(DEFINES) \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
-I$(top_builddir)/src \
|
-I$(top_builddir)/src \
|
||||||
-I$(top_srcdir)/src \
|
-I$(top_srcdir)/src \
|
||||||
|
-I$(top_srcdir)/src/amd/common \
|
||||||
-I$(top_builddir)/src/compiler \
|
-I$(top_builddir)/src/compiler \
|
||||||
-I$(top_builddir)/src/compiler/nir \
|
-I$(top_builddir)/src/compiler/nir \
|
||||||
-I$(top_srcdir)/src/compiler \
|
-I$(top_srcdir)/src/compiler \
|
||||||
|
@ -37,21 +40,24 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/gallium/auxiliary \
|
-I$(top_srcdir)/src/gallium/auxiliary \
|
||||||
-I$(top_srcdir)/src/gallium/include
|
-I$(top_srcdir)/src/gallium/include
|
||||||
|
|
||||||
AM_CFLAGS = $(VISIBILITY_CFLAGS) \
|
common_libamd_common_la_CFLAGS = \
|
||||||
|
$(VISIBILITY_CFLAGS) \
|
||||||
$(PTHREAD_CFLAGS) \
|
$(PTHREAD_CFLAGS) \
|
||||||
$(LLVM_CFLAGS) \
|
$(LLVM_CFLAGS) \
|
||||||
$(LIBELF_CFLAGS)
|
$(LIBELF_CFLAGS)
|
||||||
|
|
||||||
AM_CXXFLAGS = \
|
common_libamd_common_la_CXXFLAGS = \
|
||||||
$(VISIBILITY_CXXFLAGS) \
|
$(VISIBILITY_CXXFLAGS) \
|
||||||
$(LLVM_CXXFLAGS)
|
$(LLVM_CXXFLAGS)
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libamd_common.la
|
noinst_LTLIBRARIES += $(COMMON_LIBS)
|
||||||
|
|
||||||
libamd_common_la_SOURCES = $(AMD_COMPILER_SOURCES)
|
common_libamd_common_la_SOURCES = $(AMD_COMPILER_SOURCES)
|
||||||
|
|
||||||
# nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
|
# nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
|
||||||
# radv is built.
|
# radv is built.
|
||||||
if HAVE_RADEON_VULKAN
|
if HAVE_RADEON_VULKAN
|
||||||
libamd_common_la_SOURCES += $(AMD_NIR_SOURCES)
|
common_libamd_common_la_SOURCES += $(AMD_NIR_SOURCES)
|
||||||
|
endif
|
||||||
|
|
||||||
endif
|
endif
|
|
@ -1,31 +0,0 @@
|
||||||
# Copyright © 2016 Bas Nieuwenhuizen
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
|
|
||||||
AMD_COMPILER_SOURCES := \
|
|
||||||
ac_binary.c \
|
|
||||||
ac_binary.h \
|
|
||||||
ac_llvm_helper.cpp \
|
|
||||||
ac_llvm_util.c \
|
|
||||||
ac_llvm_util.h
|
|
||||||
|
|
||||||
AMD_NIR_SOURCES := \
|
|
||||||
ac_nir_to_llvm.c \
|
|
||||||
ac_nir_to_llvm.h
|
|
Loading…
Reference in New Issue