From 72c4c9da7a4074f86f4ed59d87a6e50a98b9bb06 Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Fri, 25 Sep 2009 18:47:43 +0000 Subject: Fixing up Makefiles, its not fully working but its closer... Kent --- intern/itasc/Makefile | 9 +++++---- intern/itasc/kdl/Makefile | 10 +++++----- intern/itasc/kdl/utilities/Makefile | 2 ++ 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'intern/itasc') diff --git a/intern/itasc/Makefile b/intern/itasc/Makefile index 6ac0d142b72..2272cf2c6ac 100644 --- a/intern/itasc/Makefile +++ b/intern/itasc/Makefile @@ -28,10 +28,13 @@ # iksolver main makefile. # +include nan_definitions.mk LIBNAME = itasc -DIR = $(OCGDIR)/intern/$(SOURCEDIR) - +SOURCEDIR = intern/$(LIBNAME) +DIR = $(OCGDIR)/$(SOURCEDIR) +DIRS = kdl +include nan_subdirs.mk include nan_compile.mk CPPFLAGS += -I. @@ -48,6 +51,4 @@ ifeq ($(OS),darwin) ranlib $(NAN_ITASC)/lib/debug/libitasc.a endif ############################## -DIRS = kdl -SOURCEDIR = intern/$(LIBNAME) include nan_subdirs.mk diff --git a/intern/itasc/kdl/Makefile b/intern/itasc/kdl/Makefile index e34c991db38..9b152c27c7c 100644 --- a/intern/itasc/kdl/Makefile +++ b/intern/itasc/kdl/Makefile @@ -28,15 +28,15 @@ # iksolver main makefile. # +include nan_definitions.mk + LIBNAME = itasc DIR = $(OCGDIR)/intern/$(LIBNAME) +DIRS = utilities +SOURCEDIR = intern/$(LIBNAME)/kdl +include nan_subdirs.mk include nan_compile.mk CPPFLAGS += -I. CPPFLAGS += -I../../../extern/Eigen2 - -############################## -DIRS = utilities -SOURCEDIR = intern/$(LIBNAME)/kdl -include nan_subdirs.mk diff --git a/intern/itasc/kdl/utilities/Makefile b/intern/itasc/kdl/utilities/Makefile index 6dedc24181e..4397a80cef5 100644 --- a/intern/itasc/kdl/utilities/Makefile +++ b/intern/itasc/kdl/utilities/Makefile @@ -28,6 +28,8 @@ # iksolver main makefile. # +include nan_definitions.mk + LIBNAME = itasc DIR = $(OCGDIR)/intern/$(LIBNAME) -- cgit v1.2.3