anv: use the GENERATED_FILES variable

... rather than having duplicates files through the sources lists.

Splitting things as is, has the side effect of making things clearer and
easing a potential android build. The latter of which automatically adds
BUILT_SOURCES to the binary.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index c7baf176fbbf8ad213b24efe6da2b449a415d480..8a545a896571107ccd7415fe75173697aabb702a 100644 (file)
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -69,6 +69,7 @@ AM_CPPFLAGS = \
 AM_CFLAGS = -DVK_USE_PLATFORM_XCB_KHR -Wno-override-init -msse2
 
 VULKAN_SOURCES = \
+       $(VULKAN_GENERATED_FILES) \
        $(VULKAN_FILES) \
        $(VULKAN_WSI_X11_FILES)
 

diff --git a/src/intel/vulkan/Makefile.sources b/src/intel/vulkan/Makefile.sources
index a3b6a90bcf2f5f0c63f4c5f11e4f329cfebbdc2f..ab34bfa6e01780bb320149c28ebb8cc42d8837a3 100644 (file)
--- a/src/intel/vulkan/Makefile.sources
+++ b/src/intel/vulkan/Makefile.sources
@@ -26,8 +26,6 @@ VULKAN_FILES := \
        anv_descriptor_set.c \
        anv_device.c \
        anv_dump.c \
-       anv_entrypoints.c \
-       anv_entrypoints.h \
        anv_formats.c \
        anv_image.c \
        anv_intel.c \