diff options
| author | Emil Velikov <[email protected]> | 2016-04-20 20:50:35 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-01 08:38:04 +0100 |
| commit | fe918556a21fc6050a9e4905ef63452716a9a5ae (patch) | |
| tree | f9387a9408cb225de8153c70b715a4417b18be25 /src/intel | |
| parent | 82d0b59f02ba7041b12836874f1eb3dd2b58d979 (diff) | |
anv: use a common variable to manage the library dependencies
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 8a545a89657..89d7a07fbf9 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -73,6 +73,8 @@ VULKAN_SOURCES = \ $(VULKAN_FILES) \ $(VULKAN_WSI_X11_FILES) +VULKAN_LIB_DEPS = + BUILT_SOURCES = \ $(VULKAN_GENERATED_FILES) @@ -112,6 +114,17 @@ endif noinst_LTLIBRARIES += libvulkan_common.la libvulkan_common_la_SOURCES = $(VULKAN_SOURCES) +VULKAN_LIB_DEPS += $(WAYLAND_LIBS) \ + libvulkan_common.la \ + -lxcb -lxcb-dri3 -lxcb-present -lxcb-sync -lxshmfence \ + $(top_builddir)/src/intel/isl/libisl.la \ + $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \ + $(top_builddir)/src/mesa/libmesa.la \ + $(top_builddir)/src/mesa/drivers/dri/common/libdri_test_stubs.la \ + -lpthread -ldl -lstdc++ \ + $(PER_GEN_LIBS) \ + -lm + libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES) anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS) @@ -122,16 +135,7 @@ anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS) CLEANFILES = $(BUILT_SOURCES) -libvulkan_intel_la_LIBADD = $(WAYLAND_LIBS) \ - libvulkan_common.la \ - -lxcb -lxcb-dri3 -lxcb-present -lxcb-sync -lxshmfence \ - $(top_builddir)/src/intel/isl/libisl.la \ - $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \ - $(top_builddir)/src/mesa/libmesa.la \ - $(top_builddir)/src/mesa/drivers/dri/common/libdri_test_stubs.la \ - -lpthread -ldl -lstdc++ \ - $(PER_GEN_LIBS) \ - -lm +libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS) libvulkan_intel_la_LDFLAGS = \ -shared \ @@ -154,7 +158,7 @@ dev_icd.json : dev_icd.json.in # Libvulkan with dummy gem. Used for unit tests. libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES) -libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD) +libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) include $(top_srcdir)/install-lib-links.mk |