diff options
author | Wouter van Heyst <larstiq-bforge@larstiq.dyndns.org> | 2003-02-03 06:56:41 +0300 |
---|---|---|
committer | Wouter van Heyst <larstiq-bforge@larstiq.dyndns.org> | 2003-02-03 06:56:41 +0300 |
commit | ce1ee7193be54574e5c64c41990a1f155ea364b5 (patch) | |
tree | 1e01eb6a5f47d2a4003253002ce8547a43ac08c1 | |
parent | cdfeebb00f6c81187aa46f5ca31c0b1b03d4732a (diff) |
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
-rw-r--r-- | Makefile | 11 | ||||
-rw-r--r-- | intern/Makefile | 2 |
2 files changed, 4 insertions, 9 deletions
@@ -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 |