diff options
author | Chris Want <cwant@ualberta.ca> | 2009-03-19 04:50:45 +0300 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2009-03-19 04:50:45 +0300 |
commit | 77e0199dc386c26aa106a884f24b336fce82d351 (patch) | |
tree | 1e7d355e193947d3b52b4ab7ea2327953efdb05b /intern/guardedalloc | |
parent | 3aab50f775e4928d3ee525a999e2b4c995ae9ae4 (diff) |
Makefile updates for Blender 2.5 (from GSR)
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r-- | intern/guardedalloc/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/intern/guardedalloc/Makefile b/intern/guardedalloc/Makefile index f0cef3d222c..55894d54c8e 100644 --- a/intern/guardedalloc/Makefile +++ b/intern/guardedalloc/Makefile @@ -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): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # decimation main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_GUARDEDALLOC) ] || mkdir $(NAN_GUARDEDALLOC) @[ -d $(NAN_GUARDEDALLOC)/include ] || mkdir $(NAN_GUARDEDALLOC)/include - @[ -d $(NAN_GUARDEDALLOC)/lib ] || mkdir $(NAN_GUARDEDALLOC)/lib - @[ -d $(NAN_GUARDEDALLOC)/lib/debug ] || mkdir $(NAN_GUARDEDALLOC)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/debug/ + @[ -d $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a - ranlib $(NAN_GUARDEDALLOC)/lib/debug/libguardedalloc.a + ranlib $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR)libguardedalloc.a endif @../tools/cpifdiff.sh *.h $(NAN_GUARDEDALLOC)/include/ |