summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-06-09 16:18:41 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-09 16:18:41 -0600
commit5f46bf77af5f49e63976ad51c5b4a7da8490be3e (patch)
tree3691556c19d14d93117685c02099dca2c35a199b
parent0116ec1af36356c0ee845b3d1384e73316052497 (diff)
mesa: Xlib libGL.so fixes from master
-rw-r--r--src/mesa/drivers/x11/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile
index 8ee9b618081..51226eeae11 100644
--- 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)