Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile11
-rw-r--r--intern/Makefile2
2 files changed, 4 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 21ca5aa64dd..58770c7c1f7 100644
--- 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 7ae2322d475..bed8713c4ed 100644
--- 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