diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2007-08-02 20:33:58 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-08-02 20:33:58 +0100 |
| commit | d878bdc7a107991075080f9d6d2f1489b966981f (patch) | |
| tree | f9e8303316f7322d74caddef1155e189d904d1f5 | |
| parent | bf64be22686a8e5168bf80d1a57e367da3fffd57 (diff) | |
Fix make recursion.
Unfortunately means you can't just type make in softpipe any more.
| -rw-r--r-- | src/mesa/Makefile | 3 | ||||
| -rw-r--r-- | src/mesa/pipe/softpipe/Makefile | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 3055564341..ee4cbd0d38 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 947983baf0..04464154e7 100644 --- a/src/mesa/pipe/softpipe/Makefile +++ b/src/mesa/pipe/softpipe/Makefile @@ -40,5 +40,3 @@ include ../Makefile.template symlinks: -default:: - cd ../.. ; make |