[wip/Move3D-Qt-Gui-libs] Remove options, fix PLIST and depend.mk

Move3D-Qt-Gui-libs/Makefile

@@ -19,32 +19,12 @@ CMAKE_ARGS+= -DEigen_INCLUDE_DIR=${PREFIX.eigen2}/include/eigen2
 CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
 CMAKE_ARGS+= -DBOOST_LIBRARYDIR=${PREFIX.boost-libs}/lib
 
-PKG_OPTIONS_REQUIRED_GROUPS=	mode
-PKG_OPTIONS_GROUP.mode=	standalone GUI
 
-##
-## Option standalone
-##
-PKG_OPTION_DESCR.standalone=	Compile Move3D-Qt-Gui-libs without GUI
-define PKG_OPTION_SET.standalone
-
-endef
-
-##
-## Option GUI
-##
-PKG_OPTION_DESCR.GUI= Compile Move3D-Qt-Gui-libs with GUI
-
-define PKG_OPTION_SET.GUI
-	CMAKE_ARGS+= -DCOMPILE_WITH_GUI=ON
-	include ../../wip/sysdep/qt.mk
-endef
-
-
-## Default option
-PKG_SUGGESTED_OPTIONS+=	standalone
 
 ## Common includes
+include ../../wip/Move3D-core/depend.mk
+include ../../wip/Move3D-motionPlanner-libs/depend.mk
+
 include ../../mk/sysdep/cmake.mk
 include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk

Move3D-Qt-Gui-libs/depend.mk

@@ -16,27 +16,27 @@
 #
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-MOVE3D-MOTIONPLANNER-LIBS_DEPEND_MK:=	${MOVE3D-MOTIONPLANNER-LIBS_DEPEND_MK}+
+MOVE3D-QT-GUI-LIBS_DEPEND_MK:=	${MOVE3D-QT-GUI-LIBS_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		Move3D-motionPlanner-libs
+DEPEND_PKG+=		Move3D-Qt-Gui-libs
 endif
 
-ifeq (+,$(MOVE3D-MOTIONPLANNER-LIBS_DEPEND_MK)) # ----------------------------------
+ifeq (+,$(MOVE3D-QT-GUI-LIBS_DEPEND_MK)) # ----------------------------------
 
-PREFER.Move3D-motionPlanner-libs?=	robotpkg
+PREFER.Move3D-Qt-Gui-libs?=	robotpkg
 
-SYSTEM_SEARCH.Move3D-motionPlanner-libs=\
-	include/Move3D-motionPlanner-libs/include/planner/planner.hpp	\
-	lib/libMove3D-motionPlanner-libs.so
+SYSTEM_SEARCH.Move3D-Qt-Gui-libs=\
+	include/Move3D-Qt-Gui/src/qtLibrary.hpp	\
+	lib/libMove3D-Qt-Gui.so
 
-DEPEND_USE+=		Move3D-motionPlanner-libs
+DEPEND_USE+=		Move3D-Qt-Gui-libs
 
-DEPEND_ABI.Move3D-motionPlanner-libs?=Move3D-motionPlanner-libs>=0.0.1
-DEPEND_DIR.Move3D-motionPlanner-libs?=../../wip/Move3D-motionPlanner-libs
+DEPEND_ABI.Move3D-Qt-Gui-libs?=Move3D-Qt-Gui-libs>=1.0.0
+DEPEND_DIR.Move3D-Qt-Gui-libs?=../../wip/Move3D-Qt-Gui-libs
 
 #include ../../wip/??
 
-endif # Move3D-motionPlanner-libs_DEPEND_MK ----------------------------------------
+endif # Move3D-Qt-Gui-libs_DEPEND_MK ----------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}