From 81ae90ebfae8f738638b1a19083c51401992cb92 Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Mon, 8 Feb 2016 17:29:12 +0100
Subject: [PATCH] [wip/sot-hrprtc-hrp2] Use robotpkg openrtm-aist dependency
---
mk/sysdep/openrtm-aist.mk | 43 ---------------------------------------
sot-hrprtc-hrp2/Makefile | 2 +-
2 files changed, 1 insertion(+), 44 deletions(-)
delete mode 100644 mk/sysdep/openrtm-aist.mk
diff --git a/mk/sysdep/openrtm-aist.mk b/mk/sysdep/openrtm-aist.mk
deleted file mode 100644
index 36761dc1..00000000
--- a/mk/sysdep/openrtm-aist.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2016 LAAS/CNRS
-# All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software for any purpose
-# with or without fee is hereby granted, provided that the above copyright
-# notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-#
-# Olivier Stasse on Wed Feb 3 2016
-#
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-OPENRTM_AIST_DEPEND_MK:= ${OPENRTM_AIST_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= openrtm-aist
-endif
-
-ifeq (+,$(OPENRTM_AIST_DEPEND_MK)) # ---------------------------------------------
-
-PREFER.openrtm-aist?= system
-
-DEPEND_USE+= openrtm-aist
-
-DEPEND_ABI.openrtm-aist?= openrtm-aist>=1.0.0
-
-SYSTEM_SEARCH.openrtm-aist= \
- 'include/rtm/RTObject.h'\
- 'lib/pkgconfig/openrtm-aist.pc:/Version/s/[^.0-9]//gp'\
- 'lib/libRTC.so'
-
-SYSTEM_PKG.Ubuntu.openrtm-aist= openrtm-aist-grx
-
-endif # OPENRTM_AIST_DEPEND_MK --------------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/sot-hrprtc-hrp2/Makefile b/sot-hrprtc-hrp2/Makefile
index 862e36c0..5a578240 100644
--- a/sot-hrprtc-hrp2/Makefile
+++ b/sot-hrprtc-hrp2/Makefile
@@ -18,13 +18,13 @@ DYNAMIC_PLIST_DIRS+= share/doc/sot-hrprtc-hrp2
CMAKE_ARGS+= -DROBOTPKG=ON
-include ../../wip/mk/sysdep/openrtm-aist.mk
include ../../wip/sot-hrp2/depend.mk
include ../../robots/hrp2-14/depend.mk
include ../../wip/hrp2-bringup/depend.mk
include ../../wip/hrp2-machine/depend.mk
include ../../wip/hrp2-computer-monitor/depend.mk
include ../../wip/hrp2-14-description/depend.mk
+include ../../middleware/openrtm-aist/depend.mk
include ../../motion/sot-pattern-generator/depend.mk
include ../../wip/sot-application/depend.mk
include ../../wip/sot-dyninv/depend.mk
--
GitLab