diff options
| author | Jason Ekstrand <[email protected]> | 2016-03-02 11:31:32 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-03-02 11:45:29 -0800 |
| commit | b0867ca4b26aa6b3e30af8d6050b94d283636cbc (patch) | |
| tree | 5c47f530a4f374b2d49fb71142d3ce5059b5ca9e /src/intel/vulkan | |
| parent | 2168082a48e1f81c9c781dac9e05c61f052b86a1 (diff) | |
anv: Fix make check
Diffstat (limited to 'src/intel/vulkan')
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 10 | ||||
| -rw-r--r-- | src/intel/vulkan/tests/Makefile.am | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 7d078cff91c..272db40d10b 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -65,8 +65,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src \ -I$(top_builddir)/src/compiler \ -I$(top_builddir)/src/compiler/nir \ - -I$(top_builddir)/src/intel \ - -I$(top_builddir)/src/vulkan + -I$(top_builddir)/src/intel libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init @@ -198,7 +197,10 @@ libvulkan_test_la_SOURCES = \ $(VULKAN_SOURCES) \ anv_gem_stubs.c -libvulkan_test_la_CFLAGS = $(libvulkan_la_CFLAGS) -libvulkan_test_la_LIBADD = $(libvulkan_la_LIBADD) +libvulkan_test_la_CFLAGS = \ + -I$(top_srcdir)/src/intel/vulkan \ + $(libvulkan_intel_la_CFLAGS) + +libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD) include $(top_srcdir)/install-lib-links.mk diff --git a/src/intel/vulkan/tests/Makefile.am b/src/intel/vulkan/tests/Makefile.am index 883013d86c6..ddff73c1707 100644 --- a/src/intel/vulkan/tests/Makefile.am +++ b/src/intel/vulkan/tests/Makefile.am @@ -30,11 +30,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/mesa/drivers/dri/i965 \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/isl/ \ - -I$(top_srcdir)/src/vulkan + -I$(top_srcdir)/src/intel \ + -I$(top_srcdir)/src/intel/vulkan \ + -I$(top_builddir)/src/intel/vulkan LDADD = \ - $(top_builddir)/src/vulkan/libvulkan-test.la \ + $(top_builddir)/src/intel/vulkan/libvulkan-test.la \ $(PTHREAD_LIBS) -lm -lstdc++ check_PROGRAMS = \ |