2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853...

[blender.git] / intern / moto / Makefile

diff --git a/intern/moto/Makefile b/intern/moto/Makefile
index 97b4b321d992614581c318f808d1c04e29ccf48e..7bd7ea10abcb365a5d9a6b7f2f69aeb091f99ca4 100644 (file)
--- a/intern/moto/Makefile
+++ b/intern/moto/Makefile
@@ -1,15 +1,12 @@
 #
 # $Id$
 #
-# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+# ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version. The Blender
-# Foundation also sells licenses for use in proprietary software under
-# the Blender License.  See http://www.blender.org/BL/ for information
-# about this.
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,9 +22,9 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
-# ***** END GPL/BL DUAL LICENSE BLOCK *****
+# ***** END GPL LICENSE BLOCK *****
 # moto main makefile.
 #
 
@@ -46,7 +43,11 @@ install: all debug
        @[ -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
-       cp -f $(DIR)/libmoto.a $(NAN_MOTO)/lib/
-       cp -f $(DIR)/debug/libmoto.a $(NAN_MOTO)/lib/debug/
-       cp -f include/*.h $(NAN_MOTO)/include/
+       @../tools/cpifdiff.sh $(DIR)/libmoto.a $(NAN_MOTO)/lib/
+       @../tools/cpifdiff.sh $(DIR)/debug/libmoto.a $(NAN_MOTO)/lib/debug/
+ifeq ($(OS),darwin)
+       ranlib $(NAN_MOTO)/lib/libmoto.a
+       ranlib $(NAN_MOTO)/lib/debug/libmoto.a
+endif
+       @../tools/cpifdiff.sh include/*.h $(NAN_MOTO)/include/