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/decimation | |
| parent | 3aab50f775e4928d3ee525a999e2b4c995ae9ae4 (diff) | |
Makefile updates for Blender 2.5 (from GSR)
Diffstat (limited to 'intern/decimation')
| -rw-r--r-- | intern/decimation/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/intern/decimation/Makefile b/intern/decimation/Makefile index 9241d87c3a3..7ff87fa018b 100644 --- a/intern/decimation/Makefile +++ b/intern/decimation/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_DECIMATION) ] || mkdir $(NAN_DECIMATION) @[ -d $(NAN_DECIMATION)/include ] || mkdir $(NAN_DECIMATION)/include - @[ -d $(NAN_DECIMATION)/lib ] || mkdir $(NAN_DECIMATION)/lib - @[ -d $(NAN_DECIMATION)/lib/debug ] || mkdir $(NAN_DECIMATION)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libdecimation.a $(NAN_DECIMATION)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libdecimation.a $(NAN_DECIMATION)/lib/debug/ + @[ -d $(NAN_DECIMATION)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_DECIMATION)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libdecimation.a $(NAN_DECIMATION)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_DECIMATION)/lib/libdecimation.a - ranlib $(NAN_DECIMATION)/lib/debug/libdecimation.a + ranlib $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_DECIMATION)/include/ |