[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23494] trunk/blender: Add directives to support multi dir lib.

[gsr b3d]

Revision: 23494
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23494
Author:   gsrb3d
Date:     2009-09-26 00:38:15 +0200 (Sat, 26 Sep 2009)

Log Message:
-----------
Add directives to support multi dir lib.

Modified Paths:
--------------
    trunk/blender/intern/itasc/Makefile
    trunk/blender/intern/itasc/kdl/Makefile
    trunk/blender/intern/itasc/kdl/utilities/Makefile
    trunk/blender/source/Makefile

Modified: trunk/blender/intern/itasc/Makefile
===================================================================
--- trunk/blender/intern/itasc/Makefile	2009-09-25 18:47:43 UTC (rev 23493)
+++ trunk/blender/intern/itasc/Makefile	2009-09-25 22:38:15 UTC (rev 23494)
@@ -40,15 +40,14 @@
 CPPFLAGS += -I.
 CPPFLAGS += -I../../extern/Eigen2
 
-install: all debug
+install: $(ALL_OR_DEBUG)
 	@[ -d $(NAN_ITASC) ] || mkdir $(NAN_ITASC)
-	@[ -d $(NAN_ITASC)/lib ] || mkdir $(NAN_ITASC)/lib
-	@[ -d $(NAN_ITASC)/lib/debug ] || mkdir $(NAN_ITASC)/lib/debug
-	@../tools/cpifdiff.sh $(DIR)/libitasc.a $(NAN_ITASC)/lib/
-	@../tools/cpifdiff.sh $(DIR)/debug/libitasc.a $(NAN_ITASC)/lib/debug/
+	@[ -d $(NAN_ITASC)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_ITASC)/lib/$(DEBUG_DIR)
+	@../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libitasc.a $(DIR)/$(DEBUG_DIR)libitasc_kdl.a $(DIR)/$(DEBUG_DIR)libitasc_kdl_util.a $(NAN_ITASC)/lib/$(DEBUG_DIR)
 ifeq ($(OS),darwin)
-	ranlib $(NAN_ITASC)/lib/libitasc.a
-	ranlib $(NAN_ITASC)/lib/debug/libitasc.a
+	ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc.a
+	ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl.a
+	ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl_util.a
 endif
 ##############################
 include nan_subdirs.mk

Modified: trunk/blender/intern/itasc/kdl/Makefile
===================================================================
--- trunk/blender/intern/itasc/kdl/Makefile	2009-09-25 18:47:43 UTC (rev 23493)
+++ trunk/blender/intern/itasc/kdl/Makefile	2009-09-25 22:38:15 UTC (rev 23494)
@@ -30,8 +30,9 @@
 
 include nan_definitions.mk
 
-LIBNAME = itasc
-DIR = $(OCGDIR)/intern/$(LIBNAME)
+LIBNAME = itasc_kdl
+# Yep, same dir than parent (itasc instead of $(LIBNAME))
+DIR = $(OCGDIR)/intern/itasc
 DIRS = utilities
 SOURCEDIR = intern/$(LIBNAME)/kdl
 

Modified: trunk/blender/intern/itasc/kdl/utilities/Makefile
===================================================================
--- trunk/blender/intern/itasc/kdl/utilities/Makefile	2009-09-25 18:47:43 UTC (rev 23493)
+++ trunk/blender/intern/itasc/kdl/utilities/Makefile	2009-09-25 22:38:15 UTC (rev 23494)
@@ -30,8 +30,9 @@
 
 include nan_definitions.mk
 
-LIBNAME = itasc
-DIR = $(OCGDIR)/intern/$(LIBNAME)
+LIBNAME = itasc_kdl_util
+# Same dir than parent (itasc instead of $(LIBNAME))
+DIR = $(OCGDIR)/intern/itasc
 
 include nan_compile.mk
 

Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile	2009-09-25 18:47:43 UTC (rev 23493)
+++ trunk/blender/source/Makefile	2009-09-25 22:38:15 UTC (rev 23494)
@@ -101,6 +101,8 @@
 COMLIB += $(OCGDIR)/blender/ikplugin/$(DEBUG_DIR)libikplugin.a
 COMLIB += $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a
 COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc.a
+COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl.a
+COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl_util.a
 COMLIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a
 COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a
 COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a