automake: drop "EGL_" from HAVE_EGL_PLATFORM_WAYLAND
authorEmil Velikov <emil.l.velikov@gmail.com>
Wed, 20 Apr 2016 19:18:02 +0000 (20:18 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Sun, 1 May 2016 07:38:05 +0000 (08:38 +0100)
Analogous to previous commit.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
configure.ac
src/Makefile.am
src/egl/Makefile.am
src/gbm/Makefile.am
src/intel/vulkan/Makefile.am

index 33c68cfcf4cda8813251445d8698cff1b7748b65..1c626021e9cc28f6c7a391113633089110acd038 100644 (file)
@@ -1991,7 +1991,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')
index 9a1fddfacbcbc52b43eaa4932e461f7e28cb7c73..29d4ea94ca937305571687955aaf52fb68ceaa59 100644 (file)
@@ -38,7 +38,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
 
index 664282a5740e96d9e0bcfcaed2d3702e2017a6e0..3f163bc3d2b7183b3fa045a6ca76f86e568ff4ae 100644 (file)
@@ -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)
index 9a584cab35202e6772d8ad346b4f4708e1641334..9ec6ea032ffa46f1c9806dbc693c81c0298586e7 100644 (file)
@@ -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)
index c1f2af6f532fd837ac1113ef06485c26c9f6e2ad..91225f2916483f4a855850607307ba4c48bca9a3 100644 (file)
@@ -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 \