Skip to content
Snippets Groups Projects
Commit 4746f825 authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[wip/jifo-pickObject] Anotate Makefile/DESCR and fix one obvious mistake

PKG_OPTIONS and PREFER are user options, they must not be set in a pkg Makefile
parent e45c855f
No related branches found
No related tags found
No related merge requests found
......@@ -2,3 +2,4 @@ Script needed to be installed for the jido-pickObject demo
Supervision scripts will be added in the future.
# Add more detail on the global demo scenario, components involved etc.
......@@ -20,6 +20,9 @@
# 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}
CATEGORIES= meta-pkg
......@@ -30,14 +33,16 @@ MAINTAINER= xavier.broquere@laas.fr
COMMENT= Meta-package for package needed for the jido-pickObject demo
REQD_BUILD_OPTIONS.pilo-genom= jido
PKG_OPTIONS.sick-genom= h2
PKG_OPTIONS.viam-libs= opencv
PKG_DEFAULT_OPTIONS= openprs
PREFER.festival= robotpkg
PREFER.OGIlexicon= robotpkg
PREFER.festlex-poslex= robotpkg
PREFER.boost= robotpkg
# Those are user options
# PKG_OPTIONS.sick-genom= h2
# PKG_OPTIONS.viam-libs= opencv
# PKG_DEFAULT_OPTIONS= openprs
# 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment