From 77e0199dc386c26aa106a884f24b336fce82d351 Mon Sep 17 00:00:00 2001 From: Chris Want Date: Thu, 19 Mar 2009 01:50:45 +0000 Subject: Makefile updates for Blender 2.5 (from GSR) --- intern/SoundSystem/Makefile | 15 +++++++-------- intern/bmfont/Makefile | 15 +++++++-------- intern/boolop/Makefile | 15 +++++++-------- intern/bsp/Makefile | 17 +++++++---------- intern/container/Makefile | 12 ++++++------ intern/decimation/Makefile | 15 +++++++-------- intern/elbeem/Makefile | 15 +++++++-------- intern/ghost/Makefile | 15 +++++++-------- intern/ghost/intern/Makefile | 6 +++--- intern/guardedalloc/Makefile | 15 +++++++-------- intern/iksolver/Makefile | 15 +++++++-------- intern/memutil/Makefile | 15 +++++++-------- intern/moto/Makefile | 15 +++++++-------- intern/opennl/Makefile | 24 ++++++++++-------------- intern/string/Makefile | 15 +++++++-------- 15 files changed, 103 insertions(+), 121 deletions(-) (limited to 'intern') diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile index 051e2643a87..61785e44e68 100644 --- a/intern/SoundSystem/Makefile +++ b/intern/SoundSystem/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): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -56,16 +58,13 @@ endif include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_SOUNDSYSTEM) ] || mkdir $(NAN_SOUNDSYSTEM) @[ -d $(NAN_SOUNDSYSTEM)/include ] || mkdir $(NAN_SOUNDSYSTEM)/include - @[ -d $(NAN_SOUNDSYSTEM)/lib ] || mkdir $(NAN_SOUNDSYSTEM)/lib - @[ -d $(NAN_SOUNDSYSTEM)/lib/debug ] || mkdir $(NAN_SOUNDSYSTEM)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/debug/ + @[ -d $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_SOUNDSYSTEM)/lib/libSoundSystem.a - ranlib $(NAN_SOUNDSYSTEM)/lib/debug/libSoundSystem.a + ranlib $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libSoundSystem.a endif @../tools/cpifdiff.sh *.h $(NAN_SOUNDSYSTEM)/include/ diff --git a/intern/bmfont/Makefile b/intern/bmfont/Makefile index bc42f52a1fb..de0fc715884 100644 --- a/intern/bmfont/Makefile +++ b/intern/bmfont/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 ***** # bmfont main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_BMFONT) ] || mkdir $(NAN_BMFONT) @[ -d $(NAN_BMFONT)/include ] || mkdir $(NAN_BMFONT)/include - @[ -d $(NAN_BMFONT)/lib ] || mkdir $(NAN_BMFONT)/lib - @[ -d $(NAN_BMFONT)/lib/debug ] || mkdir $(NAN_BMFONT)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libbmfont.a $(NAN_BMFONT)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libbmfont.a $(NAN_BMFONT)/lib/debug/ + @[ -d $(NAN_BMFONT)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BMFONT)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libbmfont.a $(NAN_BMFONT)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_BMFONT)/lib/libbmfont.a - ranlib $(NAN_BMFONT)/lib/debug/libbmfont.a + ranlib $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a endif @../tools/cpifdiff.sh *.h $(NAN_BMFONT)/include/ diff --git a/intern/boolop/Makefile b/intern/boolop/Makefile index 4058c4ca7c1..a7a08f665c7 100644 --- a/intern/boolop/Makefile +++ b/intern/boolop/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 ***** # bsp main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_BOOLOP) ] || mkdir $(NAN_BOOLOP) @[ -d $(NAN_BOOLOP)/include ] || mkdir $(NAN_BOOLOP)/include - @[ -d $(NAN_BOOLOP)/lib ] || mkdir $(NAN_BOOLOP)/lib - @[ -d $(NAN_BOOLOP)/lib/debug ] || mkdir $(NAN_BOOLOP)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libboolop.a $(NAN_BOOLOP)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libboolop.a $(NAN_BOOLOP)/lib/debug/ + @[ -d $(NAN_BOOLOP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BOOLOP)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libboolop.a $(NAN_BOOLOP)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_BOOLOP)/lib/libboolop.a - ranlib $(NAN_BOOLOP)/lib/debug/libboolop.a + ranlib $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_BOOLOP)/include/ diff --git a/intern/bsp/Makefile b/intern/bsp/Makefile index fd106acab83..cd1653206a6 100644 --- a/intern/bsp/Makefile +++ b/intern/bsp/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 ***** # bsp main makefile. @@ -38,19 +40,14 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_BSP) ] || mkdir $(NAN_BSP) @[ -d $(NAN_BSP)/include ] || mkdir $(NAN_BSP)/include - @[ -d $(NAN_BSP)/lib ] || mkdir $(NAN_BSP)/lib - @[ -d $(NAN_BSP)/lib/debug ] || mkdir $(NAN_BSP)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libbsp.a $(NAN_BSP)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libbsp.a $(NAN_BSP)/lib/debug/ + @[ -d $(NAN_BSP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BSP)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libbsp.a $(NAN_BSP)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_BSP)/lib/libbsp.a - ranlib $(NAN_BSP)/lib/debug/libbsp.a + ranlib $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_BSP)/include/ - - diff --git a/intern/container/Makefile b/intern/container/Makefile index 76cba5b3ea1..8a9c038f0ee 100644 --- a/intern/container/Makefile +++ b/intern/container/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 ***** # container main makefile. @@ -38,12 +40,10 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_CONTAINER) ] || mkdir $(NAN_CONTAINER) @[ -d $(NAN_CONTAINER)/include ] || mkdir $(NAN_CONTAINER)/include - @[ -d $(NAN_CONTAINER)/lib ] || mkdir $(NAN_CONTAINER)/lib - @[ -d $(NAN_CONTAINER)/lib/debug ] || mkdir $(NAN_CONTAINER)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libcontainer.a $(NAN_CONTAINER)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libcontainer.a $(NAN_CONTAINER)/lib/debug + @[ -d $(NAN_CONTAINER)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_CONTAINER)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libcontainer.a $(NAN_CONTAINER)/lib/$(DEBUG_DIR) @../tools/cpifdiff.sh *.h $(NAN_CONTAINER)/include/ 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/ diff --git a/intern/elbeem/Makefile b/intern/elbeem/Makefile index 9ea08d63374..e7e8a8baa64 100644 --- a/intern/elbeem/Makefile +++ b/intern/elbeem/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 ***** # elbeem main makefile. @@ -40,16 +42,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_ELBEEM) ] || mkdir $(NAN_ELBEEM) @[ -d $(NAN_ELBEEM)/include ] || mkdir $(NAN_ELBEEM)/include - @[ -d $(NAN_ELBEEM)/lib ] || mkdir $(NAN_ELBEEM)/lib - @[ -d $(NAN_ELBEEM)/lib/debug ] || mkdir $(NAN_ELBEEM)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libelbeem.a $(NAN_ELBEEM)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libelbeem.a $(NAN_ELBEEM)/lib/debug/ + @[ -d $(NAN_ELBEEM)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_ELBEEM)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libelbeem.a $(NAN_ELBEEM)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_ELBEEM)/lib/libelbeem.a - ranlib $(NAN_ELBEEM)/lib/debug/libelbeem.a + ranlib $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_ELBEEM)/include/ diff --git a/intern/ghost/Makefile b/intern/ghost/Makefile index f809a32ac8f..e983c3a9cee 100644 --- a/intern/ghost/Makefile +++ b/intern/ghost/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 ***** # ghost main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_GHOST) ] || mkdir $(NAN_GHOST) @[ -d $(NAN_GHOST)/include ] || mkdir $(NAN_GHOST)/include - @[ -d $(NAN_GHOST)/lib ] || mkdir $(NAN_GHOST)/lib - @[ -d $(NAN_GHOST)/lib/debug ] || mkdir $(NAN_GHOST)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libghost.a $(NAN_GHOST)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libghost.a $(NAN_GHOST)/lib/debug/ + @[ -d $(NAN_GHOST)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_GHOST)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libghost.a $(NAN_GHOST)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_GHOST)/lib/libghost.a - ranlib $(NAN_GHOST)/lib/debug/libghost.a + ranlib $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a endif @../tools/cpifdiff.sh *.h $(NAN_GHOST)/include/ diff --git a/intern/ghost/intern/Makefile b/intern/ghost/intern/Makefile index 467ec768720..5b95bbb3b68 100644 --- a/intern/ghost/intern/Makefile +++ b/intern/ghost/intern/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): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # ghost intern Makefile @@ -38,8 +40,6 @@ CCSRCS += GHOST_Rect.cpp GHOST_DisplayManager.cpp GHOST_C-api.cpp CCSRCS += GHOST_CallbackEventConsumer.cpp CCSRCS += GHOST_NDOFManager.cpp -include nan_definitions.mk - ifeq ($(OS),$(findstring $(OS), "darwin")) CCSRCS += $(wildcard *Carbon.cpp) endif 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/ diff --git a/intern/iksolver/Makefile b/intern/iksolver/Makefile index a6cfa88eb30..09e6e3a1c2a 100644 --- a/intern/iksolver/Makefile +++ b/intern/iksolver/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 ***** # iksolver main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_IKSOLVER) ] || mkdir $(NAN_IKSOLVER) @[ -d $(NAN_IKSOLVER)/include ] || mkdir $(NAN_IKSOLVER)/include - @[ -d $(NAN_IKSOLVER)/lib ] || mkdir $(NAN_IKSOLVER)/lib - @[ -d $(NAN_IKSOLVER)/lib/debug ] || mkdir $(NAN_IKSOLVER)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libiksolver.a $(NAN_IKSOLVER)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libiksolver.a $(NAN_IKSOLVER)/lib/debug/ + @[ -d $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libiksolver.a $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_IKSOLVER)/lib/libiksolver.a - ranlib $(NAN_IKSOLVER)/lib/debug/libiksolver.a + ranlib $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_IKSOLVER)/include/ diff --git a/intern/memutil/Makefile b/intern/memutil/Makefile index 787ca4fd58f..50aa0528f31 100644 --- a/intern/memutil/Makefile +++ b/intern/memutil/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 ***** # memutil main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_MEMUTIL) ] || mkdir $(NAN_MEMUTIL) @[ -d $(NAN_MEMUTIL)/include ] || mkdir $(NAN_MEMUTIL)/include - @[ -d $(NAN_MEMUTIL)/lib ] || mkdir $(NAN_MEMUTIL)/lib - @[ -d $(NAN_MEMUTIL)/lib/debug ] || mkdir $(NAN_MEMUTIL)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libmemutil.a $(NAN_MEMUTIL)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libmemutil.a $(NAN_MEMUTIL)/lib/debug + @[ -d $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libmemutil.a $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_MEMUTIL)/lib/libmemutil.a - ranlib $(NAN_MEMUTIL)/lib/debug/libmemutil.a + ranlib $(NAN_MEMUTIL)/lib/$(DEBUG_DIR)libmemutil.a endif @../tools/cpifdiff.sh *.h $(NAN_MEMUTIL)/include/ diff --git a/intern/moto/Makefile b/intern/moto/Makefile index 7bd7ea10abc..3ad4fde9c4e 100644 --- a/intern/moto/Makefile +++ b/intern/moto/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 ***** # moto main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_MOTO) ] || mkdir $(NAN_MOTO) @[ -d $(NAN_MOTO)/include ] || mkdir $(NAN_MOTO)/include - @[ -d $(NAN_MOTO)/lib ] || mkdir $(NAN_MOTO)/lib - @[ -d $(NAN_MOTO)/lib/debug ] || mkdir $(NAN_MOTO)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libmoto.a $(NAN_MOTO)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libmoto.a $(NAN_MOTO)/lib/debug/ + @[ -d $(NAN_MOTO)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_MOTO)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libmoto.a $(NAN_MOTO)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_MOTO)/lib/libmoto.a - ranlib $(NAN_MOTO)/lib/debug/libmoto.a + ranlib $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a endif @../tools/cpifdiff.sh include/*.h $(NAN_MOTO)/include/ diff --git a/intern/opennl/Makefile b/intern/opennl/Makefile index a84fd135d1d..023491792db 100644 --- a/intern/opennl/Makefile +++ b/intern/opennl/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 ***** # opennl main makefile. @@ -40,25 +42,19 @@ DIRS = intern superlu include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_OPENNL) ] || mkdir $(NAN_OPENNL) @[ -d $(NAN_OPENNL)/include ] || mkdir $(NAN_OPENNL)/include - @[ -d $(NAN_OPENNL)/lib ] || mkdir $(NAN_OPENNL)/lib - @[ -d $(NAN_OPENNL)/lib/debug ] || mkdir $(NAN_OPENNL)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libopennl.a $(NAN_OPENNL)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libopennl.a $(NAN_OPENNL)/lib/debug/ + @[ -d $(NAN_OPENNL)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_OPENNL)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libopennl.a $(NAN_OPENNL)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_OPENNL)/lib/libopennl.a - ranlib $(NAN_OPENNL)/lib/debug/libopennl.a + ranlib $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_OPENNL)/include/ @[ -d $(NAN_SUPERLU) ] || mkdir $(NAN_SUPERLU) - @[ -d $(NAN_SUPERLU)/lib ] || mkdir $(NAN_SUPERLU)/lib - @[ -d $(NAN_SUPERLU)/lib/debug ] || mkdir $(NAN_SUPERLU)/lib/debug - @../tools/cpifdiff.sh $(DIR_SLU)/libsuperlu.a $(NAN_SUPERLU)/lib/ - @../tools/cpifdiff.sh $(DIR_SLU)/debug/libsuperlu.a $(NAN_SUPERLU)/lib/debug/ + @[ -d $(NAN_SUPERLU)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_SUPERLU)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR_SLU)/$(DEBUG_DIR)libsuperlu.a $(NAN_SUPERLU)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_SUPERLU)/lib/libsuperlu.a - ranlib $(NAN_SUPERLU)/lib/debug/libsuperlu.a + ranlib $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a endif diff --git a/intern/string/Makefile b/intern/string/Makefile index e885b87babe..7972defd406 100644 --- a/intern/string/Makefile +++ b/intern/string/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 ***** # string main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_STRING) ] || mkdir $(NAN_STRING) @[ -d $(NAN_STRING)/include ] || mkdir $(NAN_STRING)/include - @[ -d $(NAN_STRING)/lib ] || mkdir $(NAN_STRING)/lib - @[ -d $(NAN_STRING)/lib/debug ] || mkdir $(NAN_STRING)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libstring.a $(NAN_STRING)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libstring.a $(NAN_STRING)/lib/debug/ + @[ -d $(NAN_STRING)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_STRING)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libstring.a $(NAN_STRING)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_STRING)/lib/libstring.a - ranlib $(NAN_STRING)/lib/debug/libstring.a + ranlib $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a endif @../tools/cpifdiff.sh *.h $(NAN_STRING)/include/ -- cgit v1.2.3