fix Xlib libGL.so build problem.

Also, build driverfuncs.c into libmesa.a since it's always needed.

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 53f9d80689e0883a9779254bab102c602556035b..07e181e2cd86505a46d3d371b16223a2394123d7 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -3,7 +3,6 @@
 MESA_MODULES = $(TOP)/src/mesa/libmesa.a
 
 COMMON_SOURCES = \
-        ../../common/driverfuncs.c \
         ../common/utils.c \
         ../common/texmem.c \
         ../common/vblank.c \

diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile
index ce5366e332ed50b388b717b7ed33e5f9e8c7b4bd..51226eeae1177fce5e7df57beff039e49e62ab11 100644 (file)
--- a/src/mesa/drivers/x11/Makefile
+++ b/src/mesa/drivers/x11/Makefile
@@ -59,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)
 
 
 

diff --git a/src/mesa/sources b/src/mesa/sources
index 122fdd1c04a781ad1871d9b07ed46b25becc1194..2db1843239c6138a0691253594030f2603ea14c5 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -253,6 +253,7 @@ MESA_SOURCES = \
        $(SHADER_SOURCES)       \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
+       $(COMMON_DRIVER_SOURCES) \
        $(ASM_C_SOURCES)        \
        $(SLANG_SOURCES)