diff --git a/spark-genom/Makefile b/spark-genom/Makefile index e8cf323dd8c21cfd0c69d33d017770bfa70cfd07..23d016ad21832038dd11510cdd3166f86b2fcd37 100644 --- a/spark-genom/Makefile +++ b/spark-genom/Makefile @@ -107,10 +107,10 @@ GENOM_MODULE= spark # HRI with BioMove3D REQD_BUILD_OPTIONS.BioMove3D:= jido -include ../../wip/sysdep/qt.mk include ../../wip/BioMove3D/depend.mk include ../../interfaces/genBasic-genom/depend.mk include ../../interfaces/genHum-genom/depend.mk include ../../architecture/genom/depend.mk +include ../../mk/sysdep/qt4-libs.mk include ../../mk/robotpkg.mk diff --git a/sysdep/qt.mk b/sysdep/qt.mk deleted file mode 100644 index 4858ecf5723bd81257b03c9d90ae3f65b6089a08..0000000000000000000000000000000000000000 --- a/sysdep/qt.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (c) 2010 LAAS/CNRS -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice and this list of conditions. -# 2. Redistributions in binary form must reproduce the above copyright -# notice and this list of conditions in the documentation and/or -# other materials provided with the distribution. -# -# Akin Sisbot on 7 Nov 2010 -# - -# Qt is a software toolkit for developing applications. -# This package contains base tools, like string, xml, and network handling. - - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -QT_DEPEND_MK:= ${QT_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= qt -endif - -ifeq (+,$(QT_DEPEND_MK)) # --------------------------------------------- - -PREFER.qt?= system -DEPEND_USE+= qt -DEPEND_ABI.qt?= qt>=4.0 - -SYSTEM_SEARCH.qt= \ - include/QtGui/QApplication \ - lib/libQtGui.so \ - lib/libQtOpenGL.so \ - -SYSTEM_PKG.Linux-fedora.qt=qt -#SYSTEM_PKG.Linux-ubuntu.qt=libforms-dev -#SYSTEM_PKG.Linux-debian.qt=libforms-dev - -endif # QT_DEPEND_MK --------------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}