From 372df24ebe8b0c9c6c5ee3c130b57302a0d93b42 Mon Sep 17 00:00:00 2001 From: Anthony Mallet <anthony.mallet@laas.fr> Date: Fri, 13 Sep 2013 15:00:46 +0200 Subject: [PATCH] [wip/move3d-studio] Account for moved gts + xforms dependencies While here, sort lines. --- move3d-studio/Makefile | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/move3d-studio/Makefile b/move3d-studio/Makefile index 9c322643..858f42ed 100644 --- a/move3d-studio/Makefile +++ b/move3d-studio/Makefile @@ -19,30 +19,25 @@ LICENSE= gnu-gpl-v2 CMAKE_ARGS+= -DMOVE3D_QT=ON -##CMAKE_ARGS+= -DMOVE3D_QT_REMOTE=ON -## Dependencies + +include ../../wip/libmove3d-hri/depend.mk +include ../../wip/libmove3d-planners/depend.mk +include ../../wip/libmove3d/depend.mk +include ../../wip/sysdep/glpk.mk +include ../../wip/sysdep/libxpm.mk +include ../../wip/sysdep/qhull.mk + include ../../math/gbM/depend.mk include ../../motion/softMotion-libs/depend.mk - +include ../../pkgtools/pkg-config/depend.mk +include ../../mk/sysdep/cmake.mk +include ../../mk/sysdep/glib2.mk include ../../mk/sysdep/glu.mk include ../../mk/sysdep/gsl.mk +include ../../mk/sysdep/gts.mk include ../../mk/sysdep/libxml2.mk -include ../../mk/sysdep/glib2.mk - -include ../../wip/sysdep/glpk.mk -include ../../wip/sysdep/gts.mk -include ../../wip/sysdep/qhull.mk -include ../../wip/sysdep/libxpm.mk -include ../../wip/sysdep/xforms.mk include ../../mk/sysdep/qwt.mk - -include ../../wip/libmove3d/depend.mk -include ../../wip/libmove3d-hri/depend.mk -include ../../wip/libmove3d-planners/depend.mk - -include ../../mk/sysdep/cmake.mk +include ../../mk/sysdep/xforms.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk - -include ../../pkgtools/pkg-config/depend.mk -- GitLab