mesa: add no error support to teximage()

[mesa.git] / src / amd / vulkan / Makefile.am

diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
index 44148817bcd1c405b8c24173833151bf36736359..a645432e74fc570788f4c53bcaa100449691b150 100644 (file)
--- a/src/amd/vulkan/Makefile.am
+++ b/src/amd/vulkan/Makefile.am
@@ -21,9 +21,7 @@
 
 include Makefile.sources
 
-vulkan_includedir = $(includedir)/vulkan
-
-vulkan_include_HEADERS = \
+noinst_HEADERS = \
        $(top_srcdir)/include/vulkan/vk_platform.h \
        $(top_srcdir)/include/vulkan/vulkan.h
 
@@ -32,13 +30,12 @@ lib_LTLIBRARIES = libvulkan_radeon.la
 # The gallium includes are for the util/u_math.h include from main/macros.h
 
 AM_CPPFLAGS = \
-       $(AMDGPU_CFLAGS) \
-       $(VALGRIND_CFLAGS) \
-       $(DEFINES) \
        -I$(top_srcdir)/include \
        -I$(top_builddir)/src \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/vulkan/wsi \
+       -I$(top_builddir)/src/vulkan/util \
+       -I$(top_srcdir)/src/vulkan/util \
        -I$(top_srcdir)/src/amd \
        -I$(top_srcdir)/src/amd/common \
        -I$(top_builddir)/src/compiler \
@@ -48,7 +45,10 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        -I$(top_srcdir)/src/gallium/auxiliary \
-       -I$(top_srcdir)/src/gallium/include
+       -I$(top_srcdir)/src/gallium/include \
+       $(AMDGPU_CFLAGS) \
+       $(VALGRIND_CFLAGS) \
+       $(DEFINES)
 
 AM_CFLAGS = \
        $(VISIBILITY_CFLAGS) \
@@ -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 += \
@@ -70,44 +84,24 @@ AM_CPPFLAGS += \
 
 VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES)
 
-# FIXME: Use pkg-config for X11-xcb ldflags.
-VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) -lX11-xcb
+VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS)
 endif
 
 
 if HAVE_PLATFORM_WAYLAND
 AM_CPPFLAGS += \
-       -I$(top_builddir)/src/egl/wayland/wayland-drm \
-       -I$(top_srcdir)/src/egl/wayland/wayland-drm \
        $(WAYLAND_CFLAGS) \
        -DVK_USE_PLATFORM_WAYLAND_KHR
 
 VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
 
 VULKAN_LIB_DEPS += \
-       $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \
        $(WAYLAND_LIBS)
 endif
 
 noinst_LTLIBRARIES = libvulkan_common.la
 libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
 
-VULKAN_LIB_DEPS += \
-       libvulkan_common.la \
-       $(top_builddir)/src/vulkan/wsi/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)