From 37a8b224f8b9e79662dd6fa7aede268c5838d88d Mon Sep 17 00:00:00 2001
From: Xavier Broquere <xavier.broquere@laas.fr>
Date: Wed, 27 Oct 2010 14:14:23 +0200
Subject: [PATCH] [wip/jido-pickObject] moved to wip/jido-pick-object
---
{jido-pickObject => jido-pick-object}/DESCR | 2 +-
{jido-pickObject => jido-pick-object}/Makefile | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
rename {jido-pickObject => jido-pick-object}/DESCR (67%)
rename {jido-pickObject => jido-pick-object}/Makefile (83%)
diff --git a/jido-pickObject/DESCR b/jido-pick-object/DESCR
similarity index 67%
rename from jido-pickObject/DESCR
rename to jido-pick-object/DESCR
index 0f1e359f..4147c7af 100644
--- a/jido-pickObject/DESCR
+++ b/jido-pick-object/DESCR
@@ -1,4 +1,4 @@
-Script needed to be installed for the jido-pickObject demo
+Script needed to be installed for the jido-pick-object demo
Supervision scripts will be added in the future.
diff --git a/jido-pickObject/Makefile b/jido-pick-object/Makefile
similarity index 83%
rename from jido-pickObject/Makefile
rename to jido-pick-object/Makefile
index 634aafba..ff29ee1a 100644
--- a/jido-pickObject/Makefile
+++ b/jido-pick-object/Makefile
@@ -16,21 +16,19 @@
-# robotpkg Makefile for: meta-pkgs/jido-pickObject
+# robotpkg Makefile for: meta-pkgs/jido-pick-object
# Created: Xavier BROQUERE on Mon, 25 Oct 2010
#
JIDO_DATE= 20101026
-# can't it be named jido-pick-object to be more consistent with other pkgs?
-# the directory name should reflect the pkg name as much as possible
-DISTNAME= laas-jido-pickObject-${JIDO_DATE}
+DISTNAME= laas-jido-pick-object-${JIDO_DATE}
CATEGORIES= meta-pkg
META_PACKAGE= yes
MAINTAINER= xavier.broquere@laas.fr
-COMMENT= Meta-package for package needed for the jido-pickObject demo
+COMMENT= Meta-package for package needed for the jido-pick-object demo
REQD_BUILD_OPTIONS.pilo-genom= jido
@@ -39,13 +37,16 @@ REQD_BUILD_OPTIONS.pilo-genom= jido
# PKG_OPTIONS.viam-libs= opencv
# PKG_DEFAULT_OPTIONS= openprs
+# only on the jido robot:
+#PKG_OPTIONS.lwr-genom = kukaFri-libs
+
# PREFER.festival= robotpkg
# PREFER.OGIlexicon= robotpkg
# PREFER.festlex-poslex= robotpkg
# PREFER.boost= robotpkg
include ../../hardware/sahand-libs/depend.mk
-include ../../wip/kukaFri-libs/depend.mk
+include ../../wip/lwr-genom/depend.mk
include ../../graphics/pqp/depend.mk
include ../../motion/pilo-genom/depend.mk
include ../../localization/segloc-genom/depend.mk
--
GitLab