Module: Mesa Branch: 17.0 Commit: 360c0e74cc82cf7798c9d9618a4538f0852b886d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=360c0e74cc82cf7798c9d9618a4538f0852b886d
Author: Emil Velikov <[email protected]> Date: Fri May 19 18:43:15 2017 +0100 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]> (cherry picked from commit 2b6ad89d8695c6b87c113eda198a65389bae9f3a) --- src/amd/vulkan/Makefile.am | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am index 66708cb680..4e70188072 100644 --- a/src/amd/vulkan/Makefile.am +++ b/src/amd/vulkan/Makefile.am @@ -57,8 +57,21 @@ VULKAN_SOURCES = \ $(VULKAN_GENERATED_FILES) \ $(VULKAN_FILES) -VULKAN_LIB_DEPS = - +VULKAN_LIB_DEPS = \ + libvulkan_common.la \ + $(top_builddir)/src/vulkan/wsi/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 += \ @@ -90,22 +103,6 @@ endif noinst_LTLIBRARIES = libvulkan_common.la libvulkan_common_la_SOURCES = $(VULKAN_SOURCES) -VULKAN_LIB_DEPS += \ - libvulkan_common.la \ - $(top_builddir)/src/vulkan/wsi/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) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
