[Mesa-dev] [PATCH 18/25] automake: drop "EGL_" from HAVE_EGL_PLATFORM_WAYLAND

Emil Velikov emil.l.velikov at gmail.com
Thu Apr 21 13:16:18 UTC 2016


Analogous to previous commit.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 configure.ac                 | 2 +-
 src/Makefile.am              | 2 +-
 src/egl/Makefile.am          | 2 +-
 src/gbm/Makefile.am          | 2 +-
 src/intel/vulkan/Makefile.am | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index ddd4fe1..3856105 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1979,7 +1979,7 @@ else
 fi
 
 AM_CONDITIONAL(HAVE_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11')
-AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland')
+AM_CONDITIONAL(HAVE_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_SURFACELESS, echo "$egl_platforms" | grep -q 'surfaceless')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep -q 'null')
diff --git a/src/Makefile.am b/src/Makefile.am
index a0572b7..dcc5d30 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,7 @@ if HAVE_DRI_GLX
 SUBDIRS += glx
 endif
 
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
 SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
 endif
 
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 664282a..3f163bc 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -64,7 +64,7 @@ libEGL_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la
 endif
 endif
 
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
 AM_CFLAGS += -DHAVE_WAYLAND_PLATFORM
 AM_CFLAGS += $(WAYLAND_CFLAGS)
 libEGL_la_LIBADD += $(WAYLAND_LIBS)
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 9a584ca..9ec6ea0 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -32,7 +32,7 @@ libgbm_la_LIBADD = \
 	$(top_builddir)/src/loader/libloader.la \
 	$(DLOPEN_LIBS)
 
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
 AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
 AM_CFLAGS += $(WAYLAND_CFLAGS)
 libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS)
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 4d12a5b..360e97f 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -97,7 +97,7 @@ VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS)
 endif
 
 
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
 AM_CPPFLAGS += \
 	-I$(top_builddir)/src/egl/wayland/wayland-drm \
 	-I$(top_srcdir)/src/egl/wayland/wayland-drm
-- 
2.8.0



More information about the mesa-dev mailing list