Mesa (master): egl: Use gbm/wayland flags regardless of egl_dri2

[Benjamin Franzke]

Module: Mesa
Branch: master
Commit: efb4872a9d6e3aa6b02f6bc7426b311ae816e20d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=efb4872a9d6e3aa6b02f6bc7426b311ae816e20d

Author: Benjamin Franzke <benjaminfranzke at googlemail.com>
Date:   Mon Aug 29 09:21:30 2011 +0200

egl: Use gbm/wayland flags regardless of egl_dri2

Since they are needed for display autodetection.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40443

---

 src/egl/main/Makefile |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 3172ad2..5e5090e 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -61,23 +61,23 @@ LOCAL_LIBS += $(TOP)/src/egl/drivers/dri2/libegl_dri2.a
 ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
 EGL_LIB_DEPS += $(XCB_DRI2_LIBS)
 endif
-ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
-EGL_LIB_DEPS += -lgbm
-INCLUDE_DIRS += -I$(TOP)/src/gbm/main
+EGL_LIB_DEPS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB)
 endif
-EGL_LIB_DEPS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB) $(WAYLAND_LIBS)
+ifeq ($(filter glx, $(EGL_DRIVERS_DIRS)),glx)
+LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
+LOCAL_LIBS += $(TOP)/src/egl/drivers/glx/libegl_glx.a
+EGL_LIB_DEPS += $(X11_LIBS) $(DLOPEN_LIBS)
 endif
 
-
+# libs/cflags for display type autodetection
 ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
 LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
+EGL_LIB_DEPS += $(WAYLAND_LIBS)
 INCLUDE_DIRS += $(WAYLAND_CFLAGS)
 endif
-
-ifeq ($(filter glx, $(EGL_DRIVERS_DIRS)),glx)
-LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
-LOCAL_LIBS += $(TOP)/src/egl/drivers/glx/libegl_glx.a
-EGL_LIB_DEPS += $(X11_LIBS) $(DLOPEN_LIBS)
+ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
+EGL_LIB_DEPS += -lgbm
+INCLUDE_DIRS += -I$(TOP)/src/gbm/main
 endif
 
 # translate --with-egl-platforms to _EGLPlatformType