summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-05-19 18:43:15 +0100
committerEmil Velikov <[email protected]>2017-05-29 16:42:44 +0100
commit2b6ad89d8695c6b87c113eda198a65389bae9f3a (patch)
treeb5fada782ebc28fecfb49710328469824fbad69e
parent3e8790bff096a1a56bd1a3046c556a7f93b68ca8 (diff)
radv: automake: list shared libraries after the static ones
Analogous to previous commit - the compiler can discard xcb + wayland libs, since there is no user (the static libraries) before it on the command line. Cc: [email protected] Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eduardo Lima Mitev <[email protected]>
-rw-r--r--src/amd/vulkan/Makefile.am35
1 files changed, 16 insertions, 19 deletions
diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
index 88af9102a3b..a645432e74f 100644
--- a/src/amd/vulkan/Makefile.am
+++ b/src/amd/vulkan/Makefile.am
@@ -59,8 +59,22 @@ VULKAN_SOURCES = \
$(VULKAN_GENERATED_FILES) \
$(VULKAN_FILES)
-VULKAN_LIB_DEPS =
-
+VULKAN_LIB_DEPS = \
+ libvulkan_common.la \
+ $(top_builddir)/src/vulkan/libvulkan_util.la \
+ $(top_builddir)/src/vulkan/libvulkan_wsi.la \
+ $(top_builddir)/src/amd/common/libamd_common.la \
+ $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la \
+ $(top_builddir)/src/compiler/nir/libnir.la \
+ $(top_builddir)/src/util/libmesautil.la \
+ $(LLVM_LIBS) \
+ $(LIBELF_LIBS) \
+ $(PTHREAD_LIBS) \
+ $(AMDGPU_LIBS) \
+ $(LIBDRM_LIBS) \
+ $(PTHREAD_LIBS) \
+ $(DLOPEN_LIBS) \
+ -lm
if HAVE_PLATFORM_X11
AM_CPPFLAGS += \
@@ -88,23 +102,6 @@ endif
noinst_LTLIBRARIES = libvulkan_common.la
libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
-VULKAN_LIB_DEPS += \
- libvulkan_common.la \
- $(top_builddir)/src/vulkan/libvulkan_util.la \
- $(top_builddir)/src/vulkan/libvulkan_wsi.la \
- $(top_builddir)/src/amd/common/libamd_common.la \
- $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la \
- $(top_builddir)/src/compiler/nir/libnir.la \
- $(top_builddir)/src/util/libmesautil.la \
- $(LLVM_LIBS) \
- $(LIBELF_LIBS) \
- $(PTHREAD_LIBS) \
- $(AMDGPU_LIBS) \
- $(LIBDRM_LIBS) \
- $(PTHREAD_LIBS) \
- $(DLOPEN_LIBS) \
- -lm
-
nodist_EXTRA_libvulkan_radeon_la_SOURCES = dummy.cpp
libvulkan_radeon_la_SOURCES = $(VULKAN_GEM_FILES)