diff options
| author | Alex Smith <[email protected]> | 2017-06-06 12:31:05 +0100 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-06-06 08:17:13 -0700 |
| commit | 621b3410f5f88e2a3743bc025b100717cac26e63 (patch) | |
| tree | 1b3714721de48490a4a25f361e93c400f0e03f7b /src/vulkan/Makefile.am | |
| parent | 2ef73473c8eedab679637334a0af597d26222e0a (diff) | |
util/vulkan: Move Vulkan utilities to src/vulkan/util
We have Vulkan utilities in both src/util and src/vulkan/util. The
latter seems a more appropriate place for Vulkan-specific things, so
move them there.
v2: Android build system changes (from Tapani Pälli)
Signed-off-by: Alex Smith <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/vulkan/Makefile.am')
| -rw-r--r-- | src/vulkan/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index 71fb2d97bba..c897a07d6a8 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -11,6 +11,10 @@ PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) EXTRA_DIST = \ util/gen_enum_to_str.py +VULKAN_UTIL_SOURCES = \ + $(VULKAN_UTIL_FILES) \ + $(VULKAN_UTIL_GENERATED_FILES) + BUILT_SOURCES = \ $(VULKAN_UTIL_GENERATED_FILES) @@ -18,12 +22,13 @@ util/vk_enum_to_str.c util/vk_enum_to_str.h: util/gen_enum_to_str.py $(vulkan_ap $(MKDIR_GEN) $(PYTHON_GEN) $(srcdir)/util/gen_enum_to_str.py --xml $(vulkan_api_xml) --outdir $(top_builddir)/src/vulkan/util -libvulkan_util_la_SOURCES = $(VULKAN_UTIL_GENERATED_FILES) +libvulkan_util_la_SOURCES = $(VULKAN_UTIL_SOURCES) AM_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/vulkan/util \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/include |