Makefile updates for Blender 2.5 (from GSR)

7 files changed, 38 insertions, 36 deletions

diff --git a/extern/bFTGL/src/Makefile b/extern/bFTGL/src/Makefile
index 17c6016ad03..d91bcb2559d 100644
--- a/extern/bFTGL/src/Makefile
+++ b/extern/bFTGL/src/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 *****
 #
@@ -46,15 +48,13 @@ CPPFLAGS += -I../include
 CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2
 CPPFLAGS += -I$(OPENGL_HEADERS) 
 
-install: all debug
+install: $(ALL_OR_DEBUG)
 	@[ -d $(NAN_FTGL) ] || mkdir -p $(NAN_FTGL)
 	@[ -d $(NAN_FTGL)/include ] || mkdir -p $(NAN_FTGL)/include
-	@[ -d $(NAN_FTGL)/lib ] || mkdir -p $(NAN_FTGL)/lib
-	@[ -d $(NAN_FTGL)/lib/debug ] || mkdir -p $(NAN_FTGL)/lib/debug
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_FTGL)/lib/
-#	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/debug/lib$(LIBNAME).a $(NAN_FTGL)/lib/debug/
+	@[ -d $(NAN_FTGL)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_FTGL)/lib/$(DEBUG_DIR)
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_FTGL)/lib/$(DEBUG_DIR)
 ifeq ($(OS),darwin)
-	ranlib $(NAN_FTGL)/lib/lib$(LIBNAME).a
+	ranlib $(NAN_FTGL)/lib/$(DEBUG_DIR)lib$(LIBNAME).a
 endif
 	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/*.h $(NAN_FTGL)/include/
 
diff --git a/extern/binreloc/Makefile b/extern/binreloc/Makefile
index dbd093500a1..d303ab3afcc 100644
--- a/extern/binreloc/Makefile
+++ b/extern/binreloc/Makefile
@@ -1,3 +1,5 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
 #
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -30,8 +32,7 @@ CPPFLAGS += -I./include
 
 include nan_compile.mk
 
-
-install: all debug
+install: $(ALL_OR_DEBUG)
 	@[ -d $(DIR) ] || mkdir $(DIR)
 	@[ -d $(DIR)/include ] || mkdir $(DIR)/include
 	@../../intern/tools/cpifdiff.sh include/*.h $(DIR)/include/
diff --git a/extern/bullet2/Makefile b/extern/bullet2/Makefile
index f3abb86e404..d974569e63d 100644
--- a/extern/bullet2/Makefile
+++ b/extern/bullet2/Makefile
@@ -1,3 +1,5 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
 #
 # $Id$
 #
@@ -48,7 +50,7 @@ include nan_subdirs.mk
 
 CP = $(NANBLENDERHOME)/intern/tools/cpifdiff.sh
 
-install: all debug
+install: $(ALL_OR_DEBUG)
 	@[ -d $(NAN_BULLET2) ] || mkdir -p $(NAN_BULLET2)
 	@[ -d $(NAN_BULLET2)/include ] || mkdir -p $(NAN_BULLET2)/include
 	@for i in $(BULLETDIRS); do \
diff --git a/extern/glew/src/Makefile b/extern/glew/src/Makefile
index 55cc7cfccad..ebcecae45c8 100644
--- a/extern/glew/src/Makefile
+++ b/extern/glew/src/Makefile
@@ -1,3 +1,5 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
 #
 # $Id$
 #
@@ -25,7 +27,7 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): GSR
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 #
@@ -42,15 +44,13 @@ CSRCS = glew.c
 CCSRCS = 
 include nan_compile.mk 
 
-install: all debug
+install: $(ALL_OR_DEBUG)
 	@[ -d $(NAN_GLEW) ] || mkdir -p $(NAN_GLEW)
 	@[ -d $(NAN_GLEW)/include/GL ] || mkdir -p $(NAN_GLEW)/include/GL
-	@[ -d $(NAN_GLEW)/lib ] || mkdir -p $(NAN_GLEW)/lib
-	@[ -d $(NAN_GLEW)/lib/debug ] || mkdir -p $(NAN_GLEW)/lib/debug
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_GLEW)/lib/
+	@[ -d $(NAN_GLEW)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_GLEW)/lib/$(DEBUG_DIR)
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_GLEW)/lib/$(DEBUG_DIR)
 ifeq ($(OS),darwin)
-	ranlib $(NAN_GLEW)/lib/lib$(LIBNAME).a
-	ranlib $(NAN_GLEW)/lib/lib$(LIBNAME).a
+	ranlib $(NAN_GLEW)/lib/$(DEBUG_DIR)lib$(LIBNAME).a
 endif
 	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/GL/*.h $(NAN_GLEW)/include/GL
 
diff --git a/extern/ode/Makefile b/extern/ode/Makefile
index 51be666aa69..9bdef821e45 100644
--- a/extern/ode/Makefile
+++ b/extern/ode/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 *****
 
@@ -60,8 +62,7 @@ all:
 	mv $(TEMPSETTINGS) $(USERSETTINGS)
     endif
 
-# fake debug target
-debug:
+debug:: install
 
 install: all
     ifeq ($(OS),$(findstring $(OS), "freebsd linux darwin"))
diff --git a/extern/qhull/src/Makefile b/extern/qhull/src/Makefile
index 8201e44f01b..81c06758cbb 100644
--- a/extern/qhull/src/Makefile
+++ b/extern/qhull/src/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 *****
 #
@@ -40,16 +42,13 @@ CSRCS = user.c global.c stat.c io.c geom2.c poly2.c \
 CCSRCS = 
 include nan_compile.mk 
 
-install: all debug
+install: $(ALL_OR_DEBUG)
 	@[ -d $(NAN_QHULL) ] || mkdir -p $(NAN_QHULL)
 	@[ -d $(NAN_QHULL)/include/qhull ] || mkdir -p $(NAN_QHULL)/include/qhull
-	@[ -d $(NAN_QHULL)/lib ] || mkdir -p $(NAN_QHULL)/lib
-	@[ -d $(NAN_QHULL)/lib/debug ] || mkdir -p $(NAN_QHULL)/lib/debug
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_QHULL)/lib/
-#	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/debug/lib$(LIBNAME).a $(NAN_QHULL)/lib/debug/
+	@[ -d $(NAN_QHULL)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_QHULL)/lib/$(DEBUG_DIR)
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_QHULL)/lib/$(DEBUG_DIR)
 ifeq ($(OS),darwin)
-	ranlib $(NAN_QHULL)/lib/lib$(LIBNAME).a
-#	ranlib $(NAN_QHULL)/lib/debug/lib$(LIBNAME).a
+	ranlib $(NAN_QHULL)/lib/$(DEBUG_DIR)lib$(LIBNAME).a
 endif
 	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/qhull/*.h $(NAN_QHULL)/include/qhull
 
diff --git a/extern/solid/Makefile b/extern/solid/Makefile
index 3b333c5141d..206dc21c3fb 100644
--- a/extern/solid/Makefile
+++ b/extern/solid/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 *****
 #
@@ -37,18 +39,15 @@ DIRS = src
 
 include nan_subdirs.mk
 
-install: all debug
+install:  $(ALL_OR_DEBUG)
 	@[ -d $(NAN_SOLID) ] || mkdir -p $(NAN_SOLID)
 	@[ -d $(NAN_SOLID)/include/SOLID ] || mkdir -p $(NAN_SOLID)/include/SOLID
 	@[ -d $(NAN_SOLID)/include/SOLID/MT ] || mkdir -p $(NAN_SOLID)/include/SOLID/MT
-	@[ -d $(NAN_SOLID)/lib ] || mkdir -p $(NAN_SOLID)/lib
-	@[ -d $(NAN_SOLID)/lib/debug ] || mkdir -p $(NAN_SOLID)/lib/debug
+	@[ -d $(NAN_SOLID)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_SOLID)/lib/$(DEBUG_DIR)
 	@for i in $(LIBNAMES); do \
-	    $(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$$i/lib$$i.a $(NAN_SOLID)/lib/ ; \
-	    $(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$$i/debug/lib$$i.a $(NAN_SOLID)/lib/debug/ ; \
+	    $(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$$i/$(DEBUG_DIR)lib$$i.a $(NAN_SOLID)/lib/$(DEBUG_DIR) ; \
 	    if [ $(OS) = darwin ] ; then \
-            ranlib $(NAN_SOLID)/lib/lib$$i.a ; \
-            ranlib $(NAN_SOLID)/lib/debug/lib$$i.a ; \
+            ranlib $(NAN_SOLID)/lib/$(DEBUG_DIR)lib$$i.a ; \
         fi ; \
 	done
 	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh include/*.h $(NAN_SOLID)/include/SOLID