- 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
This commit is contained in:
Wouter van Heyst 2003-02-03 03:56:41 +00:00
parent cdfeebb00f
commit ce1ee7193b
2 changed files with 4 additions and 9 deletions

@ -1,13 +1,8 @@
# toplevel Makefile for blender # toplevel Makefile for blender
export NANBLENDERHOME=$(shell pwd) 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 DIRS = extern intern source
all: $(DIRS)
$(DIRS):
$(MAKE) -C $@
.PHONY: $(DIRS) all

@ -32,7 +32,7 @@
SOURCEDIR = intern SOURCEDIR = intern
# include nan_subdirs.mk include nan_subdirs.mk
ALLDIRS = string ghost guardedalloc bmfont moto container memutil ALLDIRS = string ghost guardedalloc bmfont moto container memutil
ALLDIRS += decimation iksolver keymaker bsp python/freeze ALLDIRS += decimation iksolver keymaker bsp python/freeze