diff --git a/ros-baxter-common/depend.mk b/ros-baxter-common/depend.mk
index 227a89434f7ffe2a632dc5d1a1cfb1231f24bf15..9ce446dd4eac7d8dd22d3ad9382c3832d32749e2 100644
--- a/ros-baxter-common/depend.mk
+++ b/ros-baxter-common/depend.mk
@@ -15,11 +15,11 @@ include ../../meta-pkgs/ros-base/depend.common
PREFER.ros-baxter-common?= ${PREFER.ros-base}
SYSTEM_PREFIX.ros-baxter-common?= ${SYSTEM_PREFIX.ros-base}
-DEPEND_USE+= ros-baxter-common
-ROS_DEPEND_USE+= ros-baxter-common
+DEPEND_USE+= ros-baxter-common
+ROS_DEPEND_USE+= ros-baxter-common
-DEPEND_ABI.ros-baxter-common?= baxter-common>=1.2.0
-DEPEND_DIR.ros-baxter-common?= ../../wip/ros-baxter-common
+DEPEND_ABI.ros-baxter-common?= ros-baxter-common>=1.2.0
+DEPEND_DIR.ros-baxter-common?= ../../wip/ros-baxter-common
SYSTEM_SEARCH.ros-baxter-common=\
include/baxter_core_msgs/OpenCamera.h \
diff --git a/ros-moveit-resources/depend.mk b/ros-moveit-resources/depend.mk
index fc16d2f035d28060676f4d44c826500369216e20..fff7bcce6895c755d429e7e68e6ff30f1d4859d9 100644
--- a/ros-moveit-resources/depend.mk
+++ b/ros-moveit-resources/depend.mk
@@ -3,28 +3,28 @@
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-UNIVERSAL_ROBOT_DEPEND_MK:= ${UNIVERSAL_ROBOT_DEPEND_MK}+
+ROS_MOVEIT_RESOURCES_DEPEND_MK:= ${ROS_MOVEIT_RESOURCES_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= ros-moveit-resources
endif
-ifeq (+,$(UNIVERSAL_ROBOT_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_MOVEIT_RESOURCES_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-moveit-resources?= ${PREFER.ros-base}
+PREFER.ros-moveit-resources?= ${PREFER.ros-base}
SYSTEM_PREFIX.ros-moveit-resources?= ${SYSTEM_PREFIX.ros-base}
-DEPEND_USE+= ros-moveit-resources
-ROS_DEPEND_USE+= ros-moveit-resources
+DEPEND_USE+= ros-moveit-resources
+ROS_DEPEND_USE+= ros-moveit-resources
-DEPEND_ABI.ros-moveit-resources?= moveit-resources>=0.6.4
+DEPEND_ABI.ros-moveit-resources?= ros-moveit-resources>=0.6.4
DEPEND_DIR.ros-moveit-resources?= ../../wip/ros-moveit-resources
SYSTEM_SEARCH.ros-moveit-resources=\
include/moveit_resources/config.h \
'lib/pkgconfig/moveit_resources.pc:/Version/s/[^0-9.]//gp'
-endif # UNIVERSAL_ROBOT_DEPEND_MK --------------------------------------------
+endif # ROS_MOVEIT_RESOURCES_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/ros-moveit/depend.mk b/ros-moveit/depend.mk
index 755d0fe4cceeccd942b3e333b5f736d567daa689..a9b89c8717c8da699ba089c567f3addbf9c39ded 100644
--- a/ros-moveit/depend.mk
+++ b/ros-moveit/depend.mk
@@ -3,23 +3,23 @@
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-MOVEIT_DEPEND_MK:= ${MOVEIT_DEPEND_MK}+
+ROS_MOVEIT_DEPEND_MK:= ${ROS_MOVEIT_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= ros-moveit
endif
-ifeq (+,$(MOVEIT_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_MOVEIT_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-moveit?= ${PREFER.ros-base}
+PREFER.ros-moveit?= ${PREFER.ros-base}
SYSTEM_PREFIX.ros-moveit?= ${SYSTEM_PREFIX.ros-base}
-DEPEND_USE+= ros-moveit
+DEPEND_USE+= ros-moveit
ROS_DEPEND_USE+= ros-moveit
-DEPEND_ABI.ros-moveit?= moveit>=0.10.5
-DEPEND_DIR.ros-moveit?= ../../wip/ros-moveit
+DEPEND_ABI.ros-moveit?= ros-moveit>=0.10.5
+DEPEND_DIR.ros-moveit?= ../../wip/ros-moveit
SYSTEM_SEARCH.ros-moveit=\
include/moveit/backtrace/backtrace.h \
@@ -27,6 +27,6 @@ SYSTEM_SEARCH.ros-moveit=\
CMAKE_PREFIX_PATH.ros-moveit= ${PREFIX.ros-moveit}
-endif # MOVEIT_DEPEND_MK --------------------------------------------
+endif # ROS_MOVEIT_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/ros-object-recognition-msgs/depend.mk b/ros-object-recognition-msgs/depend.mk
index e2b71f5931879cde47b8d9d3d0b52ed8e7819677..d309312106c353567b8c28ec432384d592f77d2e 100644
--- a/ros-object-recognition-msgs/depend.mk
+++ b/ros-object-recognition-msgs/depend.mk
@@ -3,22 +3,22 @@
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-OBJECT_RECOGNITION_MSGS_DEPEND_MK:= ${OBJECT_RECOGNITION_MSGS_DEPEND_MK}+
+ROS_OBJECT_RECOGNITION_MSGS_DEPEND_MK:= ${ROS_OBJECT_RECOGNITION_MSGS_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= ros-object-recognition-msgs
endif
-ifeq (+,$(OBJECT_RECOGNITION_MSGS_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_OBJECT_RECOGNITION_MSGS_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-object-recognition-msgs?= ${PREFER.ros-base}
+PREFER.ros-object-recognition-msgs?= ${PREFER.ros-base}
SYSTEM_PREFIX.ros-object-recognition-msgs?= ${SYSTEM_PREFIX.ros-base}
-DEPEND_USE+= ros-object-recognition-msgs
-ROS_DEPEND_USE+= ros-object-recognition-msgs
+DEPEND_USE+= ros-object-recognition-msgs
+ROS_DEPEND_USE+= ros -object-recognition-msgs
-DEPEND_ABI.ros-object-recognition-msgs?= object-recognition-msgs>=0.4.1
+DEPEND_ABI.ros-object-recognition-msgs?= ros-object-recognition-msgs>=0.4.1
DEPEND_DIR.ros-object-recognition-msgs?= ../../wip/ros-object-recognition-msgs
SYSTEM_SEARCH.ros-object-recognition-msgs=\
@@ -27,6 +27,6 @@ SYSTEM_SEARCH.ros-object-recognition-msgs=\
CMAKE_PREFIX_PATH.ros-object-recognition-msgs= ${PREFIX.ros-object-recognition-msgs}
-endif # OBJECT_RECOGNITION_MSGS_DEPEND_MK --------------------------------------------
+endif # ROS_OBJECT_RECOGNITION_MSGS_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/ros-octomap-msgs/depend.mk b/ros-octomap-msgs/depend.mk
index 4bb7259331a4f6027260af59984efeb89fd7bd37..320725bcac44fa3b9c15b6bc5befaeb69d90fdc2 100644
--- a/ros-octomap-msgs/depend.mk
+++ b/ros-octomap-msgs/depend.mk
@@ -3,28 +3,28 @@
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-OCTOMAP_MSGS_DEPEND_MK:= ${OCTOMAP_MSGS_DEPEND_MK}+
+ROS_OCTOMAP_MSGS_DEPEND_MK:= ${ROS_OCTOMAP_MSGS_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= ros-octomap-msgs
endif
-ifeq (+,$(OCTOMAP_MSGS_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_OCTOMAP_MSGS_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-octomap-msgs?= ${PREFER.ros-base}
+PREFER.ros-octomap-msgs?= ${PREFER.ros-base}
SYSTEM_PREFIX.ros-octomap-msgs?= ${SYSTEM_PREFIX.ros-base}
-DEPEND_USE+= ros-octomap-msgs
-ROS_DEPEND_USE+= ros-octomap-msgs
+DEPEND_USE+= ros-octomap-msgs
+ROS_DEPEND_USE+= ros-octomap-msgs
-DEPEND_ABI.ros-octomap-msgs?= octomap-msgs>=0.3.3
-DEPEND_DIR.ros-octomap-msgs?= ../../wip/ros-octomap-msgs
+DEPEND_ABI.ros-octomap-msgs?= ros-octomap-msgs>=0.3.3
+DEPEND_DIR.ros-octomap-msgs?= ../../wip/ros-octomap-msgs
SYSTEM_SEARCH.ros-octomap-msgs=\
include/octomap_msgs/conversions.h \
'lib/pkgconfig/octomap_msgs.pc:/Version/s/[^0-9.]//gp'
-endif # OCTOMAP_MSGS_DEPEND_MK --------------------------------------------
+endif # ROS_OCTOMAP_MSGS_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/ros-py-urdf-parser/depend.mk b/ros-py-urdf-parser/depend.mk
index 9cabc9f8c6573ddf4af1db93fc96ee255d89dc2b..c2d6e8e2ff403255a84b47a9054f2e67886e4be7 100644
--- a/ros-py-urdf-parser/depend.mk
+++ b/ros-py-urdf-parser/depend.mk
@@ -3,23 +3,23 @@
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-PY_URDF_PARSER_DEPEND_MK:= ${PY_URDF_PARSER_DEPEND_MK}+
+ROS_PY_URDF_PARSER_DEPEND_MK:= ${ROS_PY_URDF_PARSER_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= ros-py-urdf-parser
endif
-ifeq (+,$(PY_URDF_PARSER_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_PY_URDF_PARSER_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-py-urdf-parser?= ${PREFER.ros-base}
+PREFER.ros-py-urdf-parser?= ${PREFER.ros-base}
SYSTEM_PREFIX.ros-py-urdf-parser?= ${SYSTEM_PREFIX.ros-base}
-DEPEND_USE+= ros-py-urdf-parser
-ROS_DEPEND_USE+= ros-py-urdf-parser
+DEPEND_USE+= ros-py-urdf-parser
+ROS_DEPEND_USE+= ros-py-urdf-parser
-DEPEND_ABI.ros-py-urdf-parser?= ${PKGTAG.python-}urdf-parser>=0.4.0
-DEPEND_DIR.ros-py-urdf-parser?= ../../wip/ros-py-urdf-parser
+DEPEND_ABI.ros-py-urdf-parser?= ros-${PKGTAG.python-}urdf-parser>=0.4.0
+DEPEND_DIR.ros-py-urdf-parser?= ../../wip/ros-py-urdf-parser
SYSTEM_SEARCH.ros-py-urdf-parser=\
share/urdfdom_py/package.xml \
@@ -27,6 +27,6 @@ SYSTEM_SEARCH.ros-py-urdf-parser=\
CMAKE_PREFIX_PATH.ros-py-urdf-parser= ${PREFIX.ros-py-urdf-parser}
-endif # PY_URDF_PARSER_DEPEND_MK --------------------------------------------
+endif # ROS_PY_URDF_PARSER_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/ros-srdfdom/depend.mk b/ros-srdfdom/depend.mk
index 65c7b44a7a3a6c7d377d15a9693faf0e9848f320..300eb5ee89e47542f8d2f7eba5ea01b15482c487 100644
--- a/ros-srdfdom/depend.mk
+++ b/ros-srdfdom/depend.mk
@@ -3,22 +3,22 @@
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-SRDFDOM_DEPEND_MK:= ${SRDFDOM_DEPEND_MK}+
+ROS_SRDFDOM_DEPEND_MK:= ${ROS_SRDFDOM_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= ros-srdfdom
endif
-ifeq (+,$(SRDFDOM_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_SRDFDOM_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-srdfdom?= ${PREFER.ros-base}
+PREFER.ros-srdfdom?= ${PREFER.ros-base}
SYSTEM_PREFIX.ros-srdfdom?= ${SYSTEM_PREFIX.ros-base}
-DEPEND_USE+= ros-srdfdom
+DEPEND_USE+= ros-srdfdom
ROS_DEPEND_USE+= ros-srdfdom
-DEPEND_ABI.ros-srdfdom?= srdfdom>=0.4.2
+DEPEND_ABI.ros-srdfdom?= ros-srdfdom>=0.4.2
DEPEND_DIR.ros-srdfdom?= ../../wip/ros-srdfdom
SYSTEM_SEARCH.ros-srdfdom=\
@@ -27,6 +27,6 @@ SYSTEM_SEARCH.ros-srdfdom=\
CMAKE_PREFIX_PATH.ros-srdfdom= ${PREFIX.ros-srdfdom}
-endif # SRDFDOM_DEPEND_MK --------------------------------------------
+endif # ROS_SRDFDOM_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/ros-warehouse-ros/depend.mk b/ros-warehouse-ros/depend.mk
index 9a3ff3d83bff284a2bd5fbc83bdb596ab935c465..11b41bf132fde424932c48e27d0895b86ada6ba5 100644
--- a/ros-warehouse-ros/depend.mk
+++ b/ros-warehouse-ros/depend.mk
@@ -3,28 +3,28 @@
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-WAREHOUSE_ROS_DEPEND_MK:= ${WAREHOUSE_ROS_DEPEND_MK}+
+ROS_WAREHOUSE_ROS_DEPEND_MK:= ${ROS_WAREHOUSE_ROS_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= ros-warehouse-ros
endif
-ifeq (+,$(WAREHOUSE_ROS_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_WAREHOUSE_ROS_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-warehouse-ros?= ${PREFER.ros-base}
+PREFER.ros-warehouse-ros?= ${PREFER.ros-base}
SYSTEM_PREFIX.ros-warehouse-ros?= ${SYSTEM_PREFIX.ros-base}
-DEPEND_USE+= ros-warehouse-ros
-ROS_DEPEND_USE+= ros-warehouse-ros
+DEPEND_USE+= ros-warehouse-ros
+ROS_DEPEND_USE+= ros-warehouse-ros
-DEPEND_ABI.ros-warehouse-ros?= warehouse-ros>=0.9.2
-DEPEND_DIR.ros-warehouse-ros?= ../../wip/ros-warehouse-ros
+DEPEND_ABI.ros-warehouse-ros?= ros-warehouse-ros>=0.9.2
+DEPEND_DIR.ros-warehouse-ros?= ../../wip/ros-warehouse-ros
SYSTEM_SEARCH.ros-warehouse-ros=\
include/warehouse_ros/exceptions.h \
'lib/pkgconfig/warehouse_ros.pc:/Version/s/[^0-9.]//gp'
-endif # WAREHOUSE_ROS_DEPEND_MK --------------------------------------------
+endif # ROS_WAREHOUSE_ROS_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}