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 920f963b588898f2c7957778093e8f519e426e20..4eecd9cd52f2f6443c835cd595422e9a39843409 100644 (file)
--- 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 a543f675a5e17e8d78738a038b5cc8c3e0708340..5ee246dc3f5205b10509eaac222e2c04524a17dc 100644 (file)
--- 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)