From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 13 Jun 2008 15:15:07 +0000 (-0600)
Subject: gallium: another attempt at fixing libglapi.a compilation for DRI builds
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2cc1b7c742aa1195e6f9cce2c9d0ded804af9dea;p=mesa.git

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 affd81b8287..3ce30a1e259 100644
--- 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
 
 
 ######################################################################