diff --git a/move3d-studio/Makefile b/move3d-studio/Makefile index 9c322643588fc549b2f5ca38d3945a2279db5bae..858f42ed5032c768977b06f5ce02112cabf3d2d1 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