From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Mon, 16 May 2011 08:36:36 +0000 (+0200)
Subject: egl: Compile wayland-drm.a into libEGL independent of egl_dri2
X-Git-Tag: mesa-7.11-rc1~711
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8033a5651fbf6f82258d8f0e846cc7324d744da;p=platform%2Fupstream%2Fmesa.git

egl: Compile wayland-drm.a into libEGL independent of egl_dri2

Fixes egl_gallium when egl_dri2 is not enabled.
---

diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index cb8f055..6c24255 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -54,6 +54,10 @@ OBJECTS = $(SOURCES:.c=.o)
 LOCAL_CFLAGS = -D_EGL_OS_UNIX=1
 LOCAL_LIBS =
 
+ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
+LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
+endif
+
 # egl_dri2 and egl_glx are built-ins
 ifeq ($(filter dri2, $(EGL_DRIVERS_DIRS)),dri2)
 LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
@@ -61,9 +65,6 @@ LOCAL_LIBS += $(TOP)/src/egl/drivers/dri2/libegl_dri2.a
 ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
 EGL_LIB_DEPS += $(XCB_DRI2_LIBS)
 endif
-ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
-LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
-endif
 EGL_LIB_DEPS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB) $(WAYLAND_LIBS)
 endif