Add directives to support multi dir lib.
authorGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Fri, 25 Sep 2009 22:38:15 +0000 (22:38 +0000)
committerGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Fri, 25 Sep 2009 22:38:15 +0000 (22:38 +0000)
intern/itasc/Makefile
intern/itasc/kdl/Makefile
intern/itasc/kdl/utilities/Makefile
source/Makefile

index 2272cf2c6acf7775bc11328766bc1e3d68334161..2be46a017dfcf44f2b114d87946fbfb350595a87 100644 (file)
@@ -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
index 9b152c27c7c8039668dc1c73baf9c12ac47771e9..058f93da4e1b1269c1e21886d1a1ea4143796e3e 100644 (file)
@@ -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
 
index 4397a80cef53e77d20291bb0467fe460e564f946..8ee08089e1072c015b6c1b79d0428f29cb8bac92 100644 (file)
@@ -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
 
index b0c15c2eba12fa1fe8f3c3825804134dbf990c4a..5a071a10a9cc3a9592109d20850e104a19cca757 100644 (file)
@@ -101,6 +101,8 @@ COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
 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