From baf35183291e3ac26520ba4223a170486cb432d1 Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Mon, 17 Jan 2011 18:56:07 +0100
Subject: [PATCH] Account for the brownian motion of packages in robotpkg
---
icu-genom/Makefile | 2 +-
jido-pick-object/Makefile | 2 +-
lwr-genom/Makefile | 4 ++--
morse/Makefile | 6 +++---
niut-genom/Makefile | 2 +-
rfid-genom/Makefile | 2 +-
spark-genom/Makefile | 4 ++--
sparkyarp-genom/Makefile | 4 ++--
stackoftasks/Makefile | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/icu-genom/Makefile b/icu-genom/Makefile
index c37197c5..48d603e1 100644
--- a/icu-genom/Makefile
+++ b/icu-genom/Makefile
@@ -17,7 +17,7 @@ GENOM_MODULE= icu
include ../../architecture/genom/depend.mk
include ../../localization/pom-genom/depend.mk
-include ../../architecture/genBasic-genom/depend.mk
+include ../../interfaces/genBasic-genom/depend.mk
include ../../hardware/platine-genom/depend.mk
include ../../wip/rfid-genom/depend.mk
include ../../mk/robotpkg.mk
diff --git a/jido-pick-object/Makefile b/jido-pick-object/Makefile
index a9303b26..e63d78df 100644
--- a/jido-pick-object/Makefile
+++ b/jido-pick-object/Makefile
@@ -51,7 +51,7 @@ REQD_BUILD_OPTIONS.mhp-genom+= spark
include ../../shell/eltclsh/depend.mk
-include ../../architecture/genHum-genom/depend.mk
+include ../../interfaces/genHum-genom/depend.mk
include ../../graphics/laaswm-libs/depend.mk
include ../../graphics/laaswm/depend.mk
include ../../graphics/pqp/depend.mk
diff --git a/lwr-genom/Makefile b/lwr-genom/Makefile
index d8c8a0a2..edb9d25b 100644
--- a/lwr-genom/Makefile
+++ b/lwr-genom/Makefile
@@ -35,9 +35,9 @@ PKG_SUPPORTED_OPTIONS+= kukaFri-libs
include ../../architecture/genom/depend.mk
include ../../localization/pom-genom/depend.mk
-include ../../architecture/genBasic-genom/depend.mk
+include ../../interfaces/genBasic-genom/depend.mk
include ../../manipulation/genManip-genom/depend.mk
-include ../../architecture/genHum-genom/depend.mk
+include ../../interfaces/genHum-genom/depend.mk
include ../../motion/softMotion-libs/depend.mk
include ../../graphics/pqp/depend.mk
include ../../graphics/coldman-libs/depend.mk
diff --git a/morse/Makefile b/morse/Makefile
index 0bd8f2ce..233407d3 100644
--- a/morse/Makefile
+++ b/morse/Makefile
@@ -49,7 +49,7 @@ PKG_OPTION_DESCR.yarp?= Install support for the YARP middleware
define PKG_OPTION_SET.yarp
CMAKE_ARGS+= -DBUILD_YARP2_SUPPORT=ON
- include ../../devel/libpyyarp/depend.mk
+ include ../../middleware/libpyyarp/depend.mk
endef
# Pocolibs support
@@ -58,8 +58,8 @@ PKG_OPTION_DESCR.pocolibs?= Install support for the Pocolibs communication libra
define PKG_OPTION_SET.pocolibs
CMAKE_ARGS+= -DBUILD_POCOLIBS_SUPPORT=ON
- include ../../architecture/genPos-genom/depend.mk
- include ../../devel/pocolibs/depend.mk
+ include ../../interfaces/genPos-genom/depend.mk
+ include ../../middleware/pocolibs/depend.mk
include ../../hardware/sick-genom/depend.mk
include ../../image/viam-genom/depend.mk
include ../../localization/pom-genom/depend.mk
diff --git a/niut-genom/Makefile b/niut-genom/Makefile
index 8d954cb3..26a11879 100644
--- a/niut-genom/Makefile
+++ b/niut-genom/Makefile
@@ -18,6 +18,6 @@ USE_LANGUAGES= c c++
include ../../wip/openni-nite/depend.mk
-include ../../architecture/genBasic-genom/depend.mk
+include ../../interfaces/genBasic-genom/depend.mk
include ../../architecture/genom/depend.mk
include ../../mk/robotpkg.mk
diff --git a/rfid-genom/Makefile b/rfid-genom/Makefile
index 339c050c..908c9130 100644
--- a/rfid-genom/Makefile
+++ b/rfid-genom/Makefile
@@ -17,6 +17,6 @@ GENOM_MODULE= rfid
include ../../architecture/genom/depend.mk
include ../../localization/pom-genom/depend.mk
-include ../../architecture/genBasic-genom/depend.mk
+include ../../interfaces/genBasic-genom/depend.mk
include ../../hardware/platine-genom/depend.mk
include ../../mk/robotpkg.mk
diff --git a/spark-genom/Makefile b/spark-genom/Makefile
index 45025647..d781d7a1 100644
--- a/spark-genom/Makefile
+++ b/spark-genom/Makefile
@@ -89,7 +89,7 @@ REQD_BUILD_OPTIONS.BioMove3D:= jido
include ../../wip/sysdep/qt.mk
include ../../wip/BioMove3D/depend.mk
-include ../../architecture/genBasic-genom/depend.mk
-include ../../architecture/genHum-genom/depend.mk
+include ../../interfaces/genBasic-genom/depend.mk
+include ../../interfaces/genHum-genom/depend.mk
include ../../architecture/genom/depend.mk
include ../../mk/robotpkg.mk
diff --git a/sparkyarp-genom/Makefile b/sparkyarp-genom/Makefile
index 9b5101e3..6be0d5ef 100644
--- a/sparkyarp-genom/Makefile
+++ b/sparkyarp-genom/Makefile
@@ -24,7 +24,7 @@ USE_LANGUAGES+= c c++
GENOM_MODULE= sparkyarp
include ../../wip/spark-genom/depend.mk
-include ../../architecture/genBasic-genom/depend.mk
-include ../../architecture/yarp/depend.mk
+include ../../interfaces/genBasic-genom/depend.mk
+include ../../middleware/yarp/depend.mk
include ../../architecture/genom/depend.mk
include ../../mk/robotpkg.mk
diff --git a/stackoftasks/Makefile b/stackoftasks/Makefile
index 1777bb1b..c3990ddd 100644
--- a/stackoftasks/Makefile
+++ b/stackoftasks/Makefile
@@ -78,7 +78,7 @@ define PKG_OPTION_SET.openhrp
CMAKE_ARGS+= -DHRP2_CONFIG_DIRECTORY=${PREFIX.hrp2_14}/share/hrp2_14
CMAKE_ARGS+= -DGENERATE_DYNFILES=ON
- include ../../architecture/openhrp/depend.mk
+ include ../../simulation/openhrp/depend.mk
include ../../robots/hrpsys-jrl/depend.mk
include ../../robots/hrp2-14/depend.mk
endef
--
GitLab