mesa: Xlib libGL.so fixes from master

diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile
index 8ee9b61808166fd03b502013e5fbd8cbff0ebc7d..51226eeae1177fce5e7df57beff039e49e62ab11 100644 (file)
--- a/src/mesa/drivers/x11/Makefile
+++ b/src/mesa/drivers/x11/Makefile
@@ -18,7 +18,6 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 HEADERS = \
        glxapi.h \
        glxheader.h \
-       realglx.h \
        xfonts.h \
        xmesaP.h \
        xm_glide.h \
@@ -27,7 +26,6 @@ HEADERS = \
 SOURCES = \
        fakeglx.c \
        glxapi.c \
-       realglx.c \
        xfonts.c \
        xm_api.c \
        xm_buffer.c \
@@ -61,7 +59,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA)
                -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
                -install $(TOP)/$(LIB_DIR) \
-               $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS)
+               $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA)