summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-06-10 16:26:23 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-10 16:26:23 -0600
commit0f36a29d5e6a50240e2c1469af68b7ac556afdc9 (patch)
tree9758b6ac3f8167161a892df982c370b4f7dac0f7 /src
parente9b6ed395a69be90cbf1e2481a9da6fa4079e88e (diff)
gallium: work-around glapi.c build problem for dri configs
Diffstat (limited to 'src')
-rw-r--r--src/mesa/Makefile16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 5f84f72bb2..affd81b828 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -19,9 +19,17 @@ 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
# libs (.a) and finally the device drivers:
-default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs
+default: depend asm_subdirs libmesa.a $(GLAPI_LIB) driver_subdirs
@@ -33,13 +41,13 @@ libmesa.a: $(MESA_OBJECTS) asm_subdirs
@ $(TOP)/bin/mklib -o mesa -static $(MESA_OBJECTS)
# Make archive of gl* API dispatcher functions only
-libglapi.a: $(GLAPI_OBJECTS) asm_subdirs
+$(GLAPI_LIB): $(GLAPI_OBJECTS) asm_subdirs
@ $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS)
######################################################################
# Device drivers
-driver_subdirs: libmesa.a libglapi.a
+driver_subdirs: libmesa.a $(GLAPI_LIB)
(cd drivers && $(MAKE))
@@ -126,7 +134,7 @@ tags:
clean:
-rm -f */*.o
-rm -f */*/*.o
- -rm -f depend depend.bak libmesa.a libglapi.a
+ -rm -f depend depend.bak libmesa.a $(GLAPI_LIB)
-rm -f drivers/*/*.o
-@cd drivers/dri && $(MAKE) clean
-@cd drivers/xorg && $(MAKE) clean