gallium: another attempt at fixing libglapi.a compilation for DRI builds

If building for DRI, make a dummy/empty libglapi.a for now.

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index affd81b82879f84003cfb9b2ae928acb7248cc57..3ce30a1e25912cffe4db12bb74931c8991795d95 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -19,12 +19,7 @@ include sources
 
 
 
-# XXX work-around glapi.c build failure for DRI builds:
-ifeq ($(WINDOW_SYSTEM), dri)
-GLAPI_LIB = 
-else
 GLAPI_LIB = libglapi.a
-endif
 
 
 # Default: build dependencies, then asm_subdirs, then convenience
@@ -42,7 +37,11 @@ libmesa.a: $(MESA_OBJECTS) asm_subdirs
 
 # Make archive of gl* API dispatcher functions only
 $(GLAPI_LIB): $(GLAPI_OBJECTS) asm_subdirs
-       @ $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS)
+       if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \
+               $(TOP)/bin/mklib -o glapi -static ; \
+       else \
+               $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS) ; \
+       fi
 
 
 ######################################################################