Makefile

- fix make/shell buglet to make use of --no-print-directory for cleaner logs
- Conform to the nan_subdirs.mk mechanism of building
intern/Makefile
- include nan_subdirs.mk again

This enables people to run make clean and all those other targets from the top
level dir again, 'make source' has been lost for now

diff --git a/Makefile b/Makefile
index 21ca5aa64dd51da6e690372e0cc1be4ef8ebfd4f..58770c7c1f7778ba367b4bf88a7449f740996e1f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,8 @@
 # toplevel Makefile for blender
 
 export NANBLENDERHOME=$(shell pwd)
-export MAKEFLAGS="-I $(NANBLENDERHOME)/source --no-print-directory"
+MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
+include source/nan_subdirs.mk
 
+SOURCEDIR = blender
 DIRS = extern intern source
-
-all: $(DIRS)
-
-$(DIRS):
-       $(MAKE) -C $@
-
-.PHONY: $(DIRS) all

diff --git a/intern/Makefile b/intern/Makefile
index 7ae2322d475a366d7f09fe43da8dac01902eed13..bed8713c4ed5dba2bc6aa8aec851ebada599e663 100644 (file)
--- a/intern/Makefile
+++ b/intern/Makefile
@@ -32,7 +32,7 @@
 
 SOURCEDIR = intern
 
-# include nan_subdirs.mk
+include nan_subdirs.mk
 
 ALLDIRS = string ghost guardedalloc bmfont moto container memutil
 ALLDIRS += decimation iksolver keymaker bsp python/freeze