vulkan: Combine wsi and util makefiles

Reviewed-by: Matt Turner <mattst88@gmail.com>

configure.ac

@@ -2691,8 +2691,7 @@ AC_CONFIG_FILES([Makefile
 		src/mesa/main/tests/Makefile
 		src/util/Makefile
 		src/util/tests/hash_table/Makefile
-		src/vulkan/util/Makefile
+		src/vulkan/Makefile])
-		src/vulkan/wsi/Makefile])
 
 AC_OUTPUT
 

src/Makefile.am

@@ -117,7 +117,7 @@ SUBDIRS += intel/tools
 endif
 
 if HAVE_VULKAN_COMMON
-SUBDIRS += vulkan/util vulkan/wsi
+SUBDIRS += vulkan
 endif
 EXTRA_DIST += vulkan/registry/vk.xml
 

src/amd/vulkan/Makefile.am

@@ -92,7 +92,7 @@ libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
 
 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 \

src/intel/vulkan/Makefile.am

@@ -127,8 +127,8 @@ libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
 
 VULKAN_LIB_DEPS += \
 	libvulkan_common.la \
-	$(top_builddir)/src/vulkan/util/libvulkan_util.la \
+	$(top_builddir)/src/vulkan/libvulkan_util.la \
-	$(top_builddir)/src/vulkan/wsi/libvulkan_wsi.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 \

src/vulkan/Makefile.am

@@ -1,9 +1,21 @@
-
 include Makefile.sources
 
-vulkan_includedir = $(includedir)/vulkan
+noinst_LTLIBRARIES = libvulkan_wsi.la libvulkan_util.la
 
-noinst_LTLIBRARIES = libvulkan_wsi.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
+
+libvulkan_util_la_SOURCES = $(VULKAN_UTIL_FILES)
 
 AM_CPPFLAGS = \
 	$(DEFINES) \

src/vulkan/Makefile.sources

@@ -0,0 +1,16 @@
+
+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

src/vulkan/util/Makefile.am

@@ -1,22 +0,0 @@
-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
-

src/vulkan/util/gen_enum_to_str.py

@@ -159,8 +159,8 @@ def xml_parser(filename):
 
 def main():
     enums = xml_parser(VK_XML)
-    for template, file_ in [(C_TEMPLATE, 'vk_enum_to_str.c'),
+    for template, file_ in [(C_TEMPLATE, 'util/vk_enum_to_str.c'),
-                            (H_TEMPLATE, 'vk_enum_to_str.h')]:
+                            (H_TEMPLATE, 'util/vk_enum_to_str.h')]:
         with open(file_, 'wb') as f:
             f.write(template.render(
                 file=os.path.basename(__file__),

src/vulkan/wsi/Makefile.sources

@@ -1,12 +0,0 @@
-
-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