From: Brian Paul <brianp@vmware.com>
Date: Wed, 25 Feb 2009 15:41:13 +0000 (-0700)
Subject: egl: use new EGL_LIB_DEPS to pass library dependencies to mklib when building libEGL
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c34c78b85381ced8bfa9f16faba9a5e9e6bf2a3a;p=mesa.git

egl: use new EGL_LIB_DEPS to pass library dependencies to mklib when building libEGL

EGL_LIB_DEPS may need fine-tuning for some platforms.  It's only defined
in configs/default ATM.
---

diff --git a/configs/default b/configs/default
index 920f963b588..4eecd9cd52f 100644
--- a/configs/default
+++ b/configs/default
@@ -102,6 +102,7 @@ GALLIUM_STATE_TRACKERS_DIRS = glx
 # Library dependencies
 #EXTRA_LIB_PATH ?=
 GL_LIB_DEPS     = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+EGL_LIB_DEPS    = $(EXTRA_LIB_PATH) -lX11 -ldl
 OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS   = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index a543f675a5e..5ee246dc3f5 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -46,8 +46,6 @@ OBJECTS = $(SOURCES:.c=.o)
 # Undefined for now
 LOCAL_CFLAGS = -D_EGL_PLATFORM_X=1
 
-LIBS = -lX11
-
 
 .c.o:
 	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@
@@ -63,7 +61,8 @@ library: $(TOP)/$(LIB_DIR)/libEGL.so
 $(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS)
 	$(MKLIB) -o EGL -linker '$(CC)' -ldflags '$(LDFLAGS)' \
 		-major 1 -minor 0 \
-		-install $(TOP)/$(LIB_DIR) -dlopen $(OBJECTS) $(LIBS)
+		-install $(TOP)/$(LIB_DIR) \
+		$(EGL_LIB_DEPS) $(OBJECTS)
 
 install:
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)