SUBDIRS += mesa
endif
-# This explicitly comes after mesa because it depends on the i965 compiler
-if HAVE_INTEL_VULKAN
-SUBDIRS += intel/vulkan
-endif
-
SUBDIRS += loader
if HAVE_DRI_GLX
SUBDIRS += glx
endif
-if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
+## Optionally required by GBM and EGL
+if HAVE_PLATFORM_WAYLAND
+SUBDIRS += egl/wayland/wayland-drm
endif
+## Optionally required by EGL (aka PLATFORM_GBM)
if HAVE_GBM
SUBDIRS += gbm
endif
+## Optionally required by EGL
+if HAVE_PLATFORM_WAYLAND
+SUBDIRS += egl/wayland/wayland-egl
+endif
+
if HAVE_EGL
SUBDIRS += egl
endif
+## Requires the i965 compiler (part of mesa) and wayland-drm
+if HAVE_INTEL_VULKAN
+SUBDIRS += intel/vulkan
+endif
+
if HAVE_GALLIUM
SUBDIRS += gallium
endif