src/mesa/main/tests/Makefile
src/util/Makefile
src/util/tests/hash_table/Makefile
- src/vulkan/util/Makefile
- src/vulkan/wsi/Makefile])
+ src/vulkan/Makefile])
AC_OUTPUT
endif
if HAVE_VULKAN_COMMON
-SUBDIRS += vulkan/util vulkan/wsi
+SUBDIRS += vulkan
endif
EXTRA_DIST += vulkan/registry/vk.xml
VULKAN_LIB_DEPS += \
libvulkan_common.la \
- $(top_builddir)/src/vulkan/wsi/libvulkan_wsi.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 \
VULKAN_LIB_DEPS += \
libvulkan_common.la \
- $(top_builddir)/src/vulkan/util/libvulkan_util.la \
- $(top_builddir)/src/vulkan/wsi/libvulkan_wsi.la \
+ $(top_builddir)/src/vulkan/libvulkan_util.la \
+ $(top_builddir)/src/vulkan/libvulkan_wsi.la \
$(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \
$(top_builddir)/src/compiler/nir/libnir.la \
$(top_builddir)/src/util/libmesautil.la \
-
include Makefile.sources
+noinst_LTLIBRARIES = libvulkan_wsi.la libvulkan_util.la
+
vulkan_includedir = $(includedir)/vulkan
+vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
+
+EXTRA_DIST = \
+ util/gen_enum_to_str.py
+
+BUILT_SOURCES = \
+ util/vk_enum_to_str.c \
+ util/vk_enum_to_str.h
+
+util/vk_enum_to_str.c util/vk_enum_to_str.h: util/gen_enum_to_str.py $(vulkan_api_xml)
+ $(AM_V_GEN)$(PYTHON2) $(srcdir)/util/gen_enum_to_str.py
-noinst_LTLIBRARIES = libvulkan_wsi.la
+libvulkan_util_la_SOURCES = $(VULKAN_UTIL_FILES)
AM_CPPFLAGS = \
$(DEFINES) \
--- /dev/null
+
+VULKAN_WSI_FILES := \
+ wsi/wsi_common.h \
+ wsi/wsi_common_queue.h
+
+VULKAN_WSI_WAYLAND_FILES := \
+ wsi/wsi_common_wayland.c \
+ wsi/wsi_common_wayland.h
+
+VULKAN_WSI_X11_FILES := \
+ wsi/wsi_common_x11.c \
+ wsi/wsi_common_x11.h
+
+VULKAN_UTIL_FILES := \
+ util/vk_enum_to_str.c \
+ util/vk_enum_to_str.h
+++ /dev/null
-vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src
-
-EXTRA_DIST = \
- gen_enum_to_str.py
-
-BUILT_SOURCES = \
- vk_enum_to_str.c \
- vk_enum_to_str.h
-
-vk_enum_to_str.c vk_enum_to_str.h: gen_enum_to_str.py $(vulkan_api_xml)
- $(AM_V_GEN)$(PYTHON2) $(srcdir)/gen_enum_to_str.py
-
-noinst_LTLIBRARIES = libvulkan_util.la
-
-libvulkan_util_la_SOURCES = \
- vk_enum_to_str.c \
- vk_enum_to_str.h
-
def main():
enums = xml_parser(VK_XML)
- for template, file_ in [(C_TEMPLATE, 'vk_enum_to_str.c'),
- (H_TEMPLATE, 'vk_enum_to_str.h')]:
+ for template, file_ in [(C_TEMPLATE, 'util/vk_enum_to_str.c'),
+ (H_TEMPLATE, 'util/vk_enum_to_str.h')]:
with open(file_, 'wb') as f:
f.write(template.render(
file=os.path.basename(__file__),
+++ /dev/null
-
-VULKAN_WSI_FILES := \
- wsi_common.h \
- wsi_common_queue.h
-
-VULKAN_WSI_WAYLAND_FILES := \
- wsi_common_wayland.c \
- wsi_common_wayland.h
-
-VULKAN_WSI_X11_FILES := \
- wsi_common_x11.c \
- wsi_common_x11.h
\ No newline at end of file