From 7337870036263518ccac75758bdaa415c28a2c1a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg=20Kristensen?= Date: Fri, 4 Dec 2015 17:13:26 -0800 Subject: [PATCH] vk: Move isl files to libisl.la helper library These will be in their own library eventually - let's just do that now. --- src/vulkan/Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index 5651f661e05..7c108e4b145 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -44,7 +44,7 @@ PER_GEN_LIBS = \ libanv-gen8.la \ libanv-gen9.la -noinst_LTLIBRARIES = $(PER_GEN_LIBS) +noinst_LTLIBRARIES = $(PER_GEN_LIBS) libisl.la # The gallium includes are for the util/u_math.h include from main/macros.h @@ -92,7 +92,11 @@ VULKAN_SOURCES = \ anv_query.c \ anv_util.c \ anv_wsi.c \ - anv_wsi_x11.c \ + anv_wsi_x11.c + +libisl_la_CFLAGS = $(libvulkan_la_CFLAGS) + +libisl_la_SOURCES = \ isl.c \ isl_format_layout.c \ isl_gen4.c \ @@ -180,7 +184,7 @@ libvulkan_la_LIBADD = $(WAYLAND_LIBS) -lxcb -lxcb-dri3 \ ../mesa/libmesa.la \ ../mesa/drivers/dri/common/libdri_test_stubs.la \ -lpthread -ldl -lstdc++ \ - $(PER_GEN_LIBS) + $(PER_GEN_LIBS) libisl.la # Libvulkan with dummy gem. Used for unit tests. -- 2.30.2