From 731068a3f9bcd42298c3ee2d80763da7c0c91821 Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Mon, 10 Dec 2012 19:27:45 +0100
Subject: [PATCH] [wip] Depend on freshly imported jafar packages in robotpkg
---
jafar-correl/Makefile | 6 +++---
jafar-gdhe/Makefile | 4 ++--
jafar-lgl/Makefile | 2 +-
jafar-qdisplay/Makefile | 6 +++---
jafar-rednav/Makefile | 2 +-
jafar-rtslam/Makefile | 6 +++---
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/jafar-correl/Makefile b/jafar-correl/Makefile
index 1a42ba39..54cab90f 100644
--- a/jafar-correl/Makefile
+++ b/jafar-correl/Makefile
@@ -17,9 +17,9 @@ CXXFLAGS += -pthread
CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include
-include ../../wip/jafar-kernel/depend.mk
-include ../../wip/jafar-image/depend.mk
-include ../../wip/jafar-jmath/depend.mk
+include ../../devel/jafar-kernel/depend.mk
+include ../../image/jafar-image/depend.mk
+include ../../math/jafar-jmath/depend.mk
include ../../image/opencv/depend.mk
include ../../pkgtools/libtool/depend.mk
diff --git a/jafar-gdhe/Makefile b/jafar-gdhe/Makefile
index 7209122a..288cfdd4 100644
--- a/jafar-gdhe/Makefile
+++ b/jafar-gdhe/Makefile
@@ -22,8 +22,8 @@ CXXFLAGS += -pthread
CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include
-include ../../wip/jafar-kernel/depend.mk
-include ../../wip/jafar-jmath/depend.mk
+include ../../devel/jafar-kernel/depend.mk
+include ../../math/jafar-jmath/depend.mk
include ../../graphics/gdhe/depend.mk
include ../../math/boost-numeric-bindings/depend.mk
include ../../devel/boost-headers/depend.mk
diff --git a/jafar-lgl/Makefile b/jafar-lgl/Makefile
index 02a79f85..45d757b5 100644
--- a/jafar-lgl/Makefile
+++ b/jafar-lgl/Makefile
@@ -30,7 +30,7 @@ define PKG_OPTION_UNSET.qdisplay
endef
-include ../../wip/jafar-kernel/depend.mk
+include ../../devel/jafar-kernel/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../pkgtools/pkg-config/depend.mk
diff --git a/jafar-qdisplay/Makefile b/jafar-qdisplay/Makefile
index fe0c2826..b414970e 100644
--- a/jafar-qdisplay/Makefile
+++ b/jafar-qdisplay/Makefile
@@ -26,9 +26,9 @@ CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include
CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE=${QMAKE}
-include ../../wip/jafar-kernel/depend.mk
-include ../../wip/jafar-image/depend.mk
-include ../../wip/jafar-jmath/depend.mk
+include ../../devel/jafar-kernel/depend.mk
+include ../../image/jafar-image/depend.mk
+include ../../math/jafar-jmath/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../math/boost-numeric-bindings/depend.mk
diff --git a/jafar-rednav/Makefile b/jafar-rednav/Makefile
index 1f3780d2..69fcf08d 100644
--- a/jafar-rednav/Makefile
+++ b/jafar-rednav/Makefile
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= yes
CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
-include ../../wip/jafar-kernel/depend.mk
+include ../../devel/jafar-kernel/depend.mk
include ../../wip/jafar-lgl/depend.mk
include ../../devel/boost-headers/depend.mk
diff --git a/jafar-rtslam/Makefile b/jafar-rtslam/Makefile
index b206a34d..a3c0f9a0 100644
--- a/jafar-rtslam/Makefile
+++ b/jafar-rtslam/Makefile
@@ -60,9 +60,9 @@ DEPEND_ABI.MTI= MTI>=0.5
include ../../wip/jafar-correl/depend.mk
include ../../wip/jafar-gdhe/depend.mk
-include ../../wip/jafar-image/depend.mk
-include ../../wip/jafar-jmath/depend.mk
-include ../../wip/jafar-kernel/depend.mk
+include ../../image/jafar-image/depend.mk
+include ../../math/jafar-jmath/depend.mk
+include ../../devel/jafar-kernel/depend.mk
include ../../wip/jafar-qdisplay/depend.mk
include ../../devel/boost-headers/depend.mk
--
GitLab