From ce1ee7193be54574e5c64c41990a1f155ea364b5 Mon Sep 17 00:00:00 2001 From: Wouter van Heyst Date: Mon, 3 Feb 2003 03:56:41 +0000 Subject: [PATCH] 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 --- Makefile | 11 +++-------- intern/Makefile | 2 +- 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