From c98ea26e16b6458b4385d6558936696e4d099455 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Fri, 7 Jan 2011 16:30:08 +0800
Subject: egl: Make egl_dri2 and egl_glx built-in drivers.

These two drivers are small in size.  Making them built-in should
simplify packaging.
---
 src/egl/drivers/glx/Makefile  | 5 ++++-
 src/egl/drivers/glx/egl_glx.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/egl/drivers/glx')

diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile
index 89981e6c3a..a1e6b731fe 100644
--- a/src/egl/drivers/glx/Makefile
+++ b/src/egl/drivers/glx/Makefile
@@ -3,7 +3,7 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-EGL_DRIVER = egl_glx.so
+EGL_DRIVER = egl_glx
 EGL_SOURCES = egl_glx.c
 
 EGL_INCLUDES = \
@@ -13,4 +13,7 @@ EGL_INCLUDES = \
 EGL_CFLAGS = $(X11_CFLAGS)
 EGL_LIBS = $(X11_LIBS) $(DLOPEN_LIBS)
 
+EGL_CFLAGS += -D_EGL_MAIN=_eglBuiltInDriverGLX
+EGL_BUILTIN = true
+
 include ../Makefile.template
diff --git a/src/egl/drivers/glx/egl_glx.c b/src/egl/drivers/glx/egl_glx.c
index db9109dacc..5fce06d66d 100644
--- a/src/egl/drivers/glx/egl_glx.c
+++ b/src/egl/drivers/glx/egl_glx.c
@@ -1115,7 +1115,7 @@ fail:
  * Create a new _EGLDriver object and init its dispatch table.
  */
 _EGLDriver *
-_eglMain(const char *args)
+_EGL_MAIN(const char *args)
 {
    struct GLX_egl_driver *GLX_drv = CALLOC_STRUCT(GLX_egl_driver);
 
-- 
cgit v1.2.3