OSDN Git Service

radv: automake: list shared libraries after the static ones
authorEmil Velikov <emil.velikov@collabora.com>
Fri, 19 May 2017 17:43:15 +0000 (18:43 +0100)
committerJuan A. Suarez Romero <jasuarez@igalia.com>
Thu, 1 Jun 2017 02:25:09 +0000 (04:25 +0200)
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: mesa-stable@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eduardo Lima Mitev <elima@igalia.com>
(cherry picked from commit 2b6ad89d8695c6b87c113eda198a65389bae9f3a)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
src/amd/vulkan/Makefile.am

index 88af910..a645432 100644 (file)
@@ -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)