X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile;h=39123d7cec921b748465a1a5fe8cd0894cfe2ea0;hb=486e5c26dc3164493b4f045b533fc1b9e1847581;hp=5c954e574daef6dab175060792c926deeed980b4;hpb=df8bc572587f04b29055bb3a36f8c3b724c63b96;p=mesa.git

diff --git a/Makefile b/Makefile
index 5c954e574da..39123d7cec9 100644
--- a/Makefile
+++ b/Makefile
@@ -7,19 +7,22 @@ SUBDIRS = src progs
 
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; make) ; \
+		(cd $$dir ; $(MAKE)) || exit 1 ; \
 	done
 
 
+doxygen:
+	(cd doxygen ; make) ; \
+
 clean:
 	@for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; make clean) ; \
+		(cd $$dir ; $(MAKE) clean) ; \
 	done
 
 
 realclean:
 	touch $(TOP)/configs/current
-	make clean
+	$(MAKE) clean
 	-rm -rf lib*
 	-rm -f $(TOP)/configs/current
 
@@ -43,11 +46,13 @@ $(TOP)/configs/current:
 # Rules to set/install a specific build configuration
 aix \
 aix-gcc \
+aix-static \
 darwin \
 darwin-static \
 freebsd \
 hpux10 \
 hpux10-gcc \
+hpux10-static \
 hpux11-32-static \
 hpux11-32-static-nothreads \
 hpux11-64-static \
@@ -63,6 +68,10 @@ linux \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
+linux-dri \
+linux-dri-x86 \
+linux-dri-x86-64 \
+linux-glide \
 linux-icc \
 linux-icc-static \
 linux-osmesa16 \
@@ -71,13 +80,17 @@ linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-solo \
+linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
 linux-static \
 linux-ultrasparc \
+linux-tcc \
 linux-x86 \
+linux-x86-debug \
 linux-x86-64 \
 linux-x86-64-static \
+linux-x86-glide \
 linux-x86-static \
 netbsd \
 openbsd \
@@ -91,8 +104,8 @@ sunos5 \
 sunos5-gcc \
 sunos5-smp \
 ultrix-gcc:
-	cp $(TOP)/configs/$@ $(TOP)/configs/current
-	make default
+	(cd configs && rm -f current && ln -s $@ current)
+	$(MAKE) default
 
 
 # Rules for making release tarballs