From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 2 Aug 2007 19:33:58 +0000 (+0100)
Subject: Fix make recursion.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d878bdc7a107991075080f9d6d2f1489b966981f;p=mesa.git

Fix make recursion.

Unfortunately means you can't just type make in softpipe any more.
---

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 3055564341e..ee4cbd0d38e 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -149,7 +149,7 @@ depend: $(ALL_SOURCES)
 subdirs:
 	@ (cd x86 ; $(MAKE))
 	@ (cd x86-64 ; $(MAKE))
-	#(cd pipe/softpipe ; $(MAKE))
+	(cd pipe/softpipe ; $(MAKE))
 
 install: default
 	$(INSTALL) -d $(INSTALL_DIR)/include/GL
@@ -182,6 +182,7 @@ clean:
 	(cd drivers/dri && $(MAKE) clean)
 	(cd x86 && $(MAKE) clean)
 	(cd x86-64 && $(MAKE) clean)
+	(cd pipe/softpipe ; $(MAKE) clean )
 
 
 include depend
diff --git a/src/mesa/pipe/softpipe/Makefile b/src/mesa/pipe/softpipe/Makefile
index 947983baf07..04464154e75 100644
--- a/src/mesa/pipe/softpipe/Makefile
+++ b/src/mesa/pipe/softpipe/Makefile
@@ -40,5 +40,3 @@ include ../Makefile.template
 
 symlinks:
 
-default::
-	cd ../.. ; make