update for WIP

Author: longhathuc

Makefile

@@ -27,6 +27,9 @@ SUBDIR+=	hatponboard-lib
 SUBDIR+=	head-action
 SUBDIR+=	hey5-description
 SUBDIR+=	hpp-affordance
+SUBDIR+=	hpp-benchmark
+SUBDIR+=	hrp2-14-description
+SUBDIR+=	hrp2-dev
 SUBDIR+=	infuse-asn1-conversions
 SUBDIR+=	infuse-asn1-types
 SUBDIR+=	infuse-envire
@@ -110,7 +113,7 @@ SUBDIR+=	py-solo-pybullet
 SUBDIR+=	py-sot-application-v3
 SUBDIR+=	py-sot-core-v3
 SUBDIR+=	py-sot-dynamic-pinocchio-v3
-SUBDIR+=	py-sot-dyninv-v3
+#SUBDIR+=	py-sot-dyninv-v3
 SUBDIR+=	py-sot-pattern-generator-v3
 SUBDIR+=	py-sot-talos
 SUBDIR+=	py-sot-talos-balance
@@ -178,4 +181,5 @@ SUBDIR+=	timeoptimization
 SUBDIR+=	ur5-description
 SUBDIR+=	urg
 
+
 include ../mk/robotpkg.subdir.mk

agimus-demos/Makefile

@@ -14,9 +14,8 @@ LICENSE=		2-clause-bsd
 CATEGORIES=		wip
 COMMENT=		agimus-demos
 
-
+include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../devel/ros-catkin/depend.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++.mk
 include ../../mk/robotpkg.mk
-include ../../devel/jrl-cmakemodules/Makefile.common

agimus-hpp/Makefile

@@ -16,7 +16,7 @@ COMMENT=		Package to link HPP to the Agimus framework
 CMAKE_ARGS+=	-DBUILD_HPP_PLUGIN=ON
 CMAKE_ARGS+= 	-DBUILD_ROS_INTERFACE=ON
 
-
+include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../wip/agimus_sot_msgs/depend.mk
 include ../../motion/dynamic-graph-bridge-msgs/depend.mk
 include ../../middleware/py-omniORBpy/depend.mk
@@ -27,4 +27,3 @@ include ../../devel/ros-catkin/depend.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++.mk
 include ../../mk/robotpkg.mk
-include ../../devel/jrl-cmakemodules/Makefile.common

agimus-sot/Makefile

@@ -14,7 +14,7 @@ LICENSE=		2-clause-bsd
 CATEGORIES=		wip
 COMMENT=		Package to link SoT to the Agimus framework.
 
-
+include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../wip/agimus_sot_msgs/depend.mk
 include ../../wip/py-dynamic-graph-v3/depend.mk
 include ../../wip/py-dynamic-graph-bridge-v3/depend.mk
@@ -25,4 +25,3 @@ include ../../devel/ros-catkin/depend.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++.mk
 include ../../mk/robotpkg.mk
-include ../../devel/jrl-cmakemodules/Makefile.common

agimus-vision/Makefile

@@ -14,10 +14,9 @@ LICENSE=		2-clause-bsd
 CATEGORIES=		wip
 COMMENT=		Computer vision for Agimus
 
-
+include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../image/ros-vision-opencv/depend.mk
 include ../../devel/ros-catkin/depend.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++.mk
 include ../../mk/robotpkg.mk
-include ../../devel/jrl-cmakemodules/Makefile.common

agimus/Makefile

@@ -14,11 +14,10 @@ LICENSE=		2-clause-bsd
 CATEGORIES=		wip
 COMMENT=		agimus
 
-
+include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../wip/agimus_sot_msgs/depend.mk
 include ../../wip/agimus-hpp/depend.mk
 include ../../devel/ros-catkin/depend.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++.mk
 include ../../mk/robotpkg.mk
-include ../../devel/jrl-cmakemodules/Makefile.common

agimus_sot_msgs/Makefile

@@ -14,8 +14,9 @@ LICENSE=		2-clause-bsd
 CATEGORIES=		wip
 COMMENT=		Messages and services for the agimus_sot package
 
+include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../devel/ros-catkin/depend.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++.mk
 include ../../mk/robotpkg.mk
-include ../../devel/jrl-cmakemodules/Makefile.common
+

play-motion/Makefile

@@ -31,10 +31,6 @@ ifeq (,$(filter 16.04%,${OS_VERSION}))
   include ../../wip/ros-moveit/depend.mk
 endif
 
-ifeq (,$(filter 18.04%,${OS_VERSION}))
-  include ../../wip/ros-moveit/depend.mk
-endif
-
 include ../../wip/py-prf-ros-control/depend.mk
 
 include ../../devel/boost-headers/depend.mk