Workaround for the header file copying dependency hell

12 files changed, 47 insertions, 47 deletions

diff --git a/intern/action/Makefile b/intern/action/Makefile
index dd5301c034e..ed1cfccfc52 100644
--- a/intern/action/Makefile
+++ b/intern/action/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # action main makefile.
@@ -46,7 +46,7 @@ install: all debug
 	@[ -d $(NAN_ACTION)/include ] || mkdir $(NAN_ACTION)/include
 	@[ -d $(NAN_ACTION)/lib ] || mkdir $(NAN_ACTION)/lib
 	@[ -d $(NAN_ACTION)/lib/debug ] || mkdir $(NAN_ACTION)/lib/debug
-	cp -f $(DIR)/libaction.a $(NAN_ACTION)/lib/
-	cp -f $(DIR)/debug/libaction.a $(NAN_ACTION)/lib/debug/
-	cp -f *.h $(NAN_ACTION)/include/
+	@../tools/cpifdiff.sh $(DIR)/libaction.a $(NAN_ACTION)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libaction.a $(NAN_ACTION)/lib/debug/
+	@../tools/cpifdiff.sh *.h $(NAN_ACTION)/include/
 
diff --git a/intern/bmfont/Makefile b/intern/bmfont/Makefile
index 037a55601ad..9c0193fee1b 100644
--- a/intern/bmfont/Makefile
+++ b/intern/bmfont/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # bmfont main makefile.
@@ -46,11 +46,11 @@ install: all debug
 	@[ -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
-	cp -f $(DIR)/libbmfont.a $(NAN_BMFONT)/lib/
-	cp -f $(DIR)/debug/libbmfont.a $(NAN_BMFONT)/lib/debug/
+	@../tools/cpifdiff.sh $(DIR)/libbmfont.a $(NAN_BMFONT)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libbmfont.a $(NAN_BMFONT)/lib/debug/
 ifeq ($(OS),darwin)
 	ranlib $(NAN_BMFONT)/lib/libbmfont.a
 	ranlib $(NAN_BMFONT)/lib/debug/libbmfont.a
 endif
-	cp -f *.h $(NAN_BMFONT)/include/
+	@../tools/cpifdiff.sh *.h $(NAN_BMFONT)/include/
 
diff --git a/intern/bsp/Makefile b/intern/bsp/Makefile
index 5d96867e3b1..818e4d69606 100644
--- a/intern/bsp/Makefile
+++ b/intern/bsp/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # bsp main makefile.
@@ -46,13 +46,13 @@ install: all debug
 	@[ -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
-	cp -f $(DIR)/libbsp.a $(NAN_BSP)/lib/
-	cp -f $(DIR)/debug/libbsp.a $(NAN_BSP)/lib/debug/
+	@../tools/cpifdiff.sh $(DIR)/libbsp.a $(NAN_BSP)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libbsp.a $(NAN_BSP)/lib/debug/
 ifeq ($(OS),darwin)
 	ranlib $(NAN_BSP)/lib/libbsp.a
 	ranlib $(NAN_BSP)/lib/debug/libbsp.a
 endif
-	cp -f extern/*.h $(NAN_BSP)/include/
+	@../tools/cpifdiff.sh extern/*.h $(NAN_BSP)/include/
 
 
 
diff --git a/intern/container/Makefile b/intern/container/Makefile
index 31ca8e8ae1a..48343612ef2 100644
--- a/intern/container/Makefile
+++ b/intern/container/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # container main makefile.
@@ -46,7 +46,7 @@ install: all debug
 	@[ -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
-	cp -f $(DIR)/libcontainer.a $(NAN_CONTAINER)/lib/
-	cp -f $(DIR)/debug/libcontainer.a $(NAN_CONTAINER)/lib/debug
-	cp -f *.h $(NAN_CONTAINER)/include/
+	@../tools/cpifdiff.sh $(DIR)/libcontainer.a $(NAN_CONTAINER)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libcontainer.a $(NAN_CONTAINER)/lib/debug
+	@../tools/cpifdiff.sh *.h $(NAN_CONTAINER)/include/
 
diff --git a/intern/decimation/Makefile b/intern/decimation/Makefile
index 60df8dd8b15..7bf645a39c9 100644
--- a/intern/decimation/Makefile
+++ b/intern/decimation/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # decimation main makefile.
@@ -46,11 +46,11 @@ install: all debug
 	@[ -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
-	cp -f $(DIR)/libdecimation.a $(NAN_DECIMATION)/lib/
-	cp -f $(DIR)/debug/libdecimation.a $(NAN_DECIMATION)/lib/debug/
+	@../tools/cpifdiff.sh $(DIR)/libdecimation.a $(NAN_DECIMATION)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libdecimation.a $(NAN_DECIMATION)/lib/debug/
 ifeq ($(OS),darwin)
 	ranlib $(NAN_DECIMATION)/lib/libdecimation.a
 	ranlib $(NAN_DECIMATION)/lib/debug/libdecimation.a
 endif
-	cp -f extern/*.h $(NAN_DECIMATION)/include/
+	@../tools/cpifdiff.sh extern/*.h $(NAN_DECIMATION)/include/
 
diff --git a/intern/ghost/Makefile b/intern/ghost/Makefile
index bfcd2d2f12a..fe65afbfb93 100644
--- a/intern/ghost/Makefile
+++ b/intern/ghost/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # ghost main makefile.
@@ -46,11 +46,11 @@ install: all debug
 	@[ -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
-	cp -f $(DIR)/libghost.a $(NAN_GHOST)/lib/
-	cp -f $(DIR)/debug/libghost.a $(NAN_GHOST)/lib/debug/
+	@../tools/cpifdiff.sh $(DIR)/libghost.a $(NAN_GHOST)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libghost.a $(NAN_GHOST)/lib/debug/
 ifeq ($(OS),darwin)
 	ranlib $(NAN_GHOST)/lib/libghost.a
 	ranlib $(NAN_GHOST)/lib/debug/libghost.a
 endif
-	cp -f *.h $(NAN_GHOST)/include/
+	@../tools/cpifdiff.sh *.h $(NAN_GHOST)/include/
 
diff --git a/intern/guardedalloc/Makefile b/intern/guardedalloc/Makefile
index a63e9107cc8..702e7d5264f 100644
--- a/intern/guardedalloc/Makefile
+++ b/intern/guardedalloc/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # decimation main makefile.
@@ -46,11 +46,11 @@ install: all debug
 	@[ -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
-	cp -f $(DIR)/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/
-	cp -f $(DIR)/debug/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/debug/
+	@../tools/cpifdiff.sh $(DIR)/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/debug/
 ifeq ($(OS),darwin)
 	ranlib $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
 	ranlib $(NAN_GUARDEDALLOC)/lib/debug/libguardedalloc.a
 endif
-	cp -f *.h $(NAN_GUARDEDALLOC)/include/
+	@../tools/cpifdiff.sh *.h $(NAN_GUARDEDALLOC)/include/
 
diff --git a/intern/iksolver/Makefile b/intern/iksolver/Makefile
index 512de299fe7..b439dcf8fa3 100644
--- a/intern/iksolver/Makefile
+++ b/intern/iksolver/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # iksolver main makefile.
@@ -46,11 +46,11 @@ install: all debug
 	@[ -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
-	cp -f $(DIR)/libiksolver.a $(NAN_IKSOLVER)/lib/
-	cp -f $(DIR)/debug/libiksolver.a $(NAN_IKSOLVER)/lib/debug/
+	@../tools/cpifdiff.sh $(DIR)/libiksolver.a $(NAN_IKSOLVER)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libiksolver.a $(NAN_IKSOLVER)/lib/debug/
 ifeq ($(OS),darwin)
 	ranlib $(NAN_IKSOLVER)/lib/libiksolver.a
 	ranlib $(NAN_IKSOLVER)/lib/debug/libiksolver.a
 endif
-	cp -f extern/*.h $(NAN_IKSOLVER)/include/
+	@../tools/cpifdiff.sh extern/*.h $(NAN_IKSOLVER)/include/
 
diff --git a/intern/keymaker/Makefile b/intern/keymaker/Makefile
index 21ff0c70192..d20bea58557 100644
--- a/intern/keymaker/Makefile
+++ b/intern/keymaker/Makefile
@@ -24,7 +24,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # blender keyreader-library makefile
@@ -71,8 +71,8 @@ install: all debug
 	@[ -d $(LCGDIR)/$(LIBNAME) ] || mkdir $(LCGDIR)/$(LIBNAME)
 	@[ -d $(LCGDIR)/$(LIBNAME)/include ] || mkdir $(LCGDIR)/$(LIBNAME)/include
 	@[ -d $(LCGDIR)/$(LIBNAME)/lib ] || mkdir $(LCGDIR)/$(LIBNAME)/lib
-	cp -f blenkey.h $(LCGDIR)/$(LIBNAME)/include/blenkey.h
-	cp -f $(LIB_a) $(LCGDIR)/$(LIBNAME)/lib/
+	@../tools/cpifdiff.sh blenkey.h $(LCGDIR)/$(LIBNAME)/include/blenkey.h
+	@../tools/cpifdiff.sh $(LIB_a) $(LCGDIR)/$(LIBNAME)/lib/
 ifeq ($(OS),darwin)
 	ranlib $(LCGDIR)/$(LIBNAME)/lib/lib$(LIBNAME).a
 endif
diff --git a/intern/memutil/Makefile b/intern/memutil/Makefile
index e163fa63eff..6c38296a6f6 100644
--- a/intern/memutil/Makefile
+++ b/intern/memutil/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # memutil main makefile.
@@ -46,7 +46,7 @@ install: all debug
 	@[ -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
-	cp -f $(DIR)/libmemutil.a $(NAN_MEMUTIL)/lib/
-	cp -f $(DIR)/debug/libmemutil.a $(NAN_MEMUTIL)/lib/debug
-	cp -f *.h $(NAN_MEMUTIL)/include/
+	@../tools/cpifdiff.sh $(DIR)/libmemutil.a $(NAN_MEMUTIL)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libmemutil.a $(NAN_MEMUTIL)/lib/debug
+	@../tools/cpifdiff.sh *.h $(NAN_MEMUTIL)/include/
 
diff --git a/intern/moto/Makefile b/intern/moto/Makefile
index 927b87bad24..0649719e92e 100644
--- a/intern/moto/Makefile
+++ b/intern/moto/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # moto main makefile.
@@ -46,11 +46,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/
+	@../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
-	cp -f include/*.h $(NAN_MOTO)/include/
+	@../tools/cpifdiff.sh include/*.h $(NAN_MOTO)/include/
 
diff --git a/intern/string/Makefile b/intern/string/Makefile
index 1079e3a281a..e3dffbe9e44 100644
--- a/intern/string/Makefile
+++ b/intern/string/Makefile
@@ -25,7 +25,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Hans Lambermont
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 # string main makefile.
@@ -46,11 +46,11 @@ install: all debug
 	@[ -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
-	cp -f $(DIR)/libstring.a $(NAN_STRING)/lib/
-	cp -f $(DIR)/debug/libstring.a $(NAN_STRING)/lib/debug/
+	@../tools/cpifdiff.sh $(DIR)/libstring.a $(NAN_STRING)/lib/
+	@../tools/cpifdiff.sh $(DIR)/debug/libstring.a $(NAN_STRING)/lib/debug/
 ifeq ($(OS),darwin)
 	ranlib $(NAN_STRING)/lib/libstring.a
 	ranlib $(NAN_STRING)/lib/debug/libstring.a
 endif
-	cp -f *.h $(NAN_STRING)/include/
+	@../tools/cpifdiff.sh *.h $(NAN_STRING)/include/