vk: Move isl files to libisl.la helper library
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Sat, 5 Dec 2015 01:13:26 +0000 (17:13 -0800)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Sat, 5 Dec 2015 05:24:15 +0000 (21:24 -0800)
These will be in their own library eventually - let's just do that now.

src/vulkan/Makefile.am

index 5651f661e0538418452392820e82986246b24c04..7c108e4b1457c2b3f252e54ec5732241afe273cc 100644 (file)
@@ -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.