summaryrefslogtreecommitdiffstats
path: root/src/mesa/Makefile.X11
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2003-08-22 20:11:43 +0000
committerBrian Paul <[email protected]>2003-08-22 20:11:43 +0000
commit5df82c82bd53db90eb72c5aad4dd20cf6f1116b1 (patch)
treef04fc69df71104df2a4cec03346abc3d4c3f4bbb /src/mesa/Makefile.X11
parent1a84876d7907df90add3f59d3396ce0bbb905040 (diff)
patch to import Jon Smirl's work from Bitkeeper
Diffstat (limited to 'src/mesa/Makefile.X11')
-rw-r--r--src/mesa/Makefile.X118
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index c672cce47a5..d014936d366 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -296,7 +296,7 @@ default:
@echo "Specify a target configuration"
-targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB)
+targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB) $(LIBMESA)
# Make the GL library
@@ -321,7 +321,9 @@ libmesa: $(LIBDIR)/$(MESA_LIB)
$(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS)
-
+mesa.a: $(CORE_OBJECTS)
+ rm -f $@ && ar rcv $@ $(CORE_OBJECTS) && ranlib $@
+
# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
# what's included by any source file.
dep: $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_DRIVER_SOURCES) $(ASM_SOURCES)
@@ -336,9 +338,9 @@ tags:
# Remove .o and backup files
clean:
+ -rm *.a
-rm -f */*.o */*~ */*.o */*~
-rm -f drivers/*/*.o
- -rm -f drivers/dri/*/*.o
include $(TOP)/Make-config