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 3055564341eb865c9a7f1e48fb61d48448b44944..ee4cbd0d38e3ba076707195b00383c6454aef538 100644 (file)
--- 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 947983baf0786a0ebf21f1ca5f5261536537d24c..04464154e7587cef82e327e1f859bb22e7ad2953 100644 (file)
--- a/src/mesa/pipe/softpipe/Makefile
+++ b/src/mesa/pipe/softpipe/Makefile
@@ -40,5 +40,3 @@ include ../Makefile.template
 
 symlinks:
 
-default::
-       cd ../.. ; make