From cc49e4cad09789ee7eb53af2d5bc1bccd6c3fffa Mon Sep 17 00:00:00 2001 From: Anthony Mallet <anthony.mallet@laas.fr> Date: Tue, 25 Jun 2019 14:39:01 +0200 Subject: [PATCH] [wip] Account for the move from simulation/bullet to mk/sysdep/bullet --- py-dynamic-graph-bridge-v3/Makefile | 3 +-- roscontrol-sot/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/py-dynamic-graph-bridge-v3/Makefile b/py-dynamic-graph-bridge-v3/Makefile index 3a980671..a246aa48 100644 --- a/py-dynamic-graph-bridge-v3/Makefile +++ b/py-dynamic-graph-bridge-v3/Makefile @@ -36,12 +36,11 @@ include ../../math/ros-geometry2/depend.mk include ../../math/ros-geometry/depend.mk include ../../motion/dynamic-graph-bridge-msgs/depend.mk include ../../pkgtools/pkg-config/depend.mk -include ../../simulation/bullet/depend.mk -include ../../simulation/bullet/depend.mk include ../../sysutils/ros-rospack/depend.mk include ../../wip/dynamic-graph-v3/depend.mk include ../../wip/py-dynamic-graph-v3/depend.mk include ../../wip/sot-core-v3/depend.mk +include ../../mk/sysdep/bullet.mk include ../../mk/sysdep/cmake.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk diff --git a/roscontrol-sot/Makefile b/roscontrol-sot/Makefile index c43d8b63..0dcb9636 100644 --- a/roscontrol-sot/Makefile +++ b/roscontrol-sot/Makefile @@ -45,7 +45,6 @@ include ../../devel/ros-realtime-tools/depend.mk include ../../interfaces/ros-common-msgs/depend.mk include ../../interfaces/ros-control-msgs/depend.mk include ../../math/ros-geometry/depend.mk -include ../../simulation/bullet/depend.mk include ../../wip/dynamic-graph-v3/depend.mk include ../../wip/py-dynamic-graph-v3/depend.mk include ../../wip/sot-core-v3/depend.mk @@ -77,6 +76,7 @@ endif include ../../devel/ros-roscpp-core/depend.mk include ../../devel/ros-catkin/depend.mk include ../../pkgtools/pkg-config/depend.mk +include ../../mk/sysdep/bullet.mk include ../../mk/sysdep/python.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk -- GitLab