diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/amd/Makefile.am | 1 | ||||
| -rw-r--r-- | src/amd/Makefile.common.am (renamed from src/amd/common/Makefile.am) | 20 | ||||
| -rw-r--r-- | src/amd/common/Makefile.sources | 31 |
5 files changed, 14 insertions, 43 deletions
diff --git a/configure.ac b/configure.ac index b89bf23801b..5f30ae8f2a4 100644 --- a/configure.ac +++ b/configure.ac @@ -2685,7 +2685,6 @@ dnl Substitute the config AC_CONFIG_FILES([Makefile src/Makefile src/amd/Makefile - src/amd/common/Makefile src/amd/vulkan/Makefile src/compiler/Makefile src/egl/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 630409c822b..ad54356f888 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -78,10 +78,6 @@ if HAVE_AMD_DRIVERS SUBDIRS += amd endif -if NEED_RADEON_LLVM -SUBDIRS += amd/common -endif - if HAVE_INTEL_DRIVERS SUBDIRS += intel endif diff --git a/src/amd/Makefile.am b/src/amd/Makefile.am index d01d43552ca..1402ca54a7d 100644 --- a/src/amd/Makefile.am +++ b/src/amd/Makefile.am @@ -25,3 +25,4 @@ noinst_LTLIBRARIES = EXTRA_DIST = $(COMMON_HEADER_FILES) include Makefile.addrlib.am +include Makefile.common.am diff --git a/src/amd/common/Makefile.am b/src/amd/Makefile.common.am index bc269abe755..7cda4fa8274 100644 --- a/src/amd/common/Makefile.am +++ b/src/amd/Makefile.common.am @@ -19,15 +19,18 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -include Makefile.sources +if NEED_RADEON_LLVM + +COMMON_LIBS = common/libamd_common.la # TODO cleanup these -AM_CPPFLAGS = \ +common_libamd_common_la_CPPFLAGS = \ $(VALGRIND_CFLAGS) \ $(DEFINES) \ -I$(top_srcdir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/amd/common \ -I$(top_builddir)/src/compiler \ -I$(top_builddir)/src/compiler/nir \ -I$(top_srcdir)/src/compiler \ @@ -37,21 +40,24 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/include -AM_CFLAGS = $(VISIBILITY_CFLAGS) \ +common_libamd_common_la_CFLAGS = \ + $(VISIBILITY_CFLAGS) \ $(PTHREAD_CFLAGS) \ $(LLVM_CFLAGS) \ $(LIBELF_CFLAGS) -AM_CXXFLAGS = \ +common_libamd_common_la_CXXFLAGS = \ $(VISIBILITY_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 # radv is built. if HAVE_RADEON_VULKAN -libamd_common_la_SOURCES += $(AMD_NIR_SOURCES) +common_libamd_common_la_SOURCES += $(AMD_NIR_SOURCES) +endif + endif diff --git a/src/amd/common/Makefile.sources b/src/amd/common/Makefile.sources deleted file mode 100644 index 0aff73be776..00000000000 --- a/src/amd/common/Makefile.sources +++ /dev/null @@ -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 |