From f3cb0dcae14ceb3fd614f36d39886d9cecc0c0e5 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 20 Apr 2016 18:07:15 +0100 Subject: [PATCH] anv: build the core vulkan only once Introduce a static library libvulkan_common.la that is used by libvukan_intel.la and libvulkan_test.la. Signed-off-by: Emil Velikov Acked-by: Jason Ekstrand --- src/intel/vulkan/Makefile.am | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 3b0238fe2e9..40775ec3403 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -110,9 +110,10 @@ AM_CFLAGS += -DHAVE_WAYLAND_PLATFORM -DVK_USE_PLATFORM_WAYLAND_KHR VULKAN_ENTRYPOINT_CPPFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR endif -libvulkan_intel_la_SOURCES = \ - $(VULKAN_SOURCES) \ - $(VULKAN_GEM_FILES) +noinst_LTLIBRARIES += libvulkan_common.la +libvulkan_common_la_SOURCES = $(VULKAN_SOURCES) + +libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES) anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS) $(AM_V_GEN) cat $(vulkan_include_HEADERS) | $(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) - | $(PYTHON2) $< header > $@ @@ -123,6 +124,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 \ @@ -152,11 +154,7 @@ dev_icd.json : dev_icd.json.in < $(srcdir)/dev_icd.json.in > $@ # Libvulkan with dummy gem. Used for unit tests. - -libvulkan_test_la_SOURCES = \ - $(VULKAN_SOURCES) \ - $(VULKAN_GEM_STUB_FILES) - +libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES) libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD) include $(top_srcdir)/install-lib-links.mk -- 2.30.2