From da5ff2ca98ae275f6e9addbad52621415fd30160 Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Fri, 25 Sep 2009 22:38:15 +0000
Subject: Add directives to support multi dir lib.

---
 intern/itasc/Makefile               | 13 ++++++-------
 intern/itasc/kdl/Makefile           |  5 +++--
 intern/itasc/kdl/utilities/Makefile |  5 +++--
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'intern/itasc')

diff --git a/intern/itasc/Makefile b/intern/itasc/Makefile
index 2272cf2c6ac..2be46a017df 100644
--- a/intern/itasc/Makefile
+++ b/intern/itasc/Makefile
@@ -40,15 +40,14 @@ include nan_compile.mk
 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
diff --git a/intern/itasc/kdl/Makefile b/intern/itasc/kdl/Makefile
index 9b152c27c7c..058f93da4e1 100644
--- a/intern/itasc/kdl/Makefile
+++ b/intern/itasc/kdl/Makefile
@@ -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
 
diff --git a/intern/itasc/kdl/utilities/Makefile b/intern/itasc/kdl/utilities/Makefile
index 4397a80cef5..8ee08089e10 100644
--- a/intern/itasc/kdl/utilities/Makefile
+++ b/intern/itasc/kdl/utilities/Makefile
@@ -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
 
-- 
cgit v1.2.3