From 77e0199dc386c26aa106a884f24b336fce82d351 Mon Sep 17 00:00:00 2001
From: Chris Want <cwant@ualberta.ca>
Date: Thu, 19 Mar 2009 01:50:45 +0000
Subject: Makefile updates for Blender 2.5 (from GSR)

---
 source/nan_definitions.mk | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'source/nan_definitions.mk')

diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 9ca458e8371..60fc56408b2 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -1,3 +1,5 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
 #
 # $Id$
 #
@@ -22,7 +24,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): GSR
 #
 # ***** END GPL LICENSE BLOCK *****
 #
@@ -31,14 +33,25 @@
 
 sinclude ../user-def.mk
 
+# This warning only takes place once in source/
+ifeq (debug, $(findstring debug, $(MAKECMDGOALS)))
+  ifeq (all, $(findstring all, $(MAKECMDGOALS)))
+    export ERRTXT = "ERROR: all and debug targets cannot be used together anymore"
+    export ERRTXT += "Use something like ..make all && make debug.. instead"
+  endif
+endif
+
+ifdef ERRTXT
+$(error $(ERRTXT))
+endif
+
 ifndef CONFIG_GUESS
   ifeq (debug, $(findstring debug, $(MAKECMDGOALS)))
-    ifeq (all, $(findstring all, $(MAKECMDGOALS)))
-all debug::
-      ERRTXT = "ERROR: all and debug targets cannot be used together anymore"
-      ERRTXT += "Use something like ..make all && make debug.. instead"
-      $(error $(ERRTXT))
-    endif
+    export DEBUG_DIR = debug/
+    export ALL_OR_DEBUG = debug
+  endif
+  ifeq (all, $(findstring all, $(MAKECMDGOALS)))
+    export ALL_OR_DEBUG ?= all
   endif
 
   # First generic defaults for all platforms which should be constant.
@@ -158,9 +171,9 @@ endif
           endif
         endif
       endif
-		 	ifeq ($(WITH_OPENEXR), true)
-				export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
-			endif
+      ifeq ($(WITH_OPENEXR), true)
+        export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
+      endif
 
     endif
   # Platform Dependent settings go below:
-- 
cgit v1.2.3