From 8f032c6aa79226862136322e94f489ecd70047e0 Mon Sep 17 00:00:00 2001 From: Anthony Mallet <anthony.mallet@laas.fr> Date: Thu, 10 Jan 2013 18:00:28 +0100 Subject: [PATCH] =?UTF-8?q?Add=20explicit=20dependency=20on=20mk/languag?= =?UTF-8?q?=C3=A6c.mk=20when=20USE=5FLANGUAGE=20is=20undefined?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All packages not defining USE_LANGUAGE were relying on the default "c" value. This commit explicits the dependency on a C compiler. --- genom3-openprs/Makefile | 1 + genom3-pocolibs/Makefile | 1 + genom3/Makefile | 1 + genomix/Makefile | 1 + hpp-geometry/Makefile | 1 + hri-simulation/Makefile | 1 + jafar-qdisplay/Makefile | 1 + jafar-rtslam/Makefile | 1 + jido-pick-object/Makefile | 1 + joystick-genom/Makefile | 1 + laas-rackham/Makefile | 1 + laaswm-gui/Makefile | 1 + lastwave/Makefile | 3 ++- libANN/Makefile | 1 + morse-pocolibs/Makefile | 1 + move3d-assets/Makefile | 1 + pr2-pick-object/Makefile | 1 + py-laaswm/Makefile | 1 + tcl-genomix/Makefile | 1 + transgen3/Makefile | 1 + viman-tags/Makefile | 1 + 21 files changed, 22 insertions(+), 1 deletion(-) diff --git a/genom3-openprs/Makefile b/genom3-openprs/Makefile index b967cc7a..f5d61b26 100644 --- a/genom3-openprs/Makefile +++ b/genom3-openprs/Makefile @@ -20,4 +20,5 @@ NOT_FOR_PLATFORM= # empty include ../../wip/transgen3/depend.mk include ../../pkgtools/pkg-config/depend.mk include ../../wip/genom3/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/genom3-pocolibs/Makefile b/genom3-pocolibs/Makefile index a124251a..751359b8 100644 --- a/genom3-pocolibs/Makefile +++ b/genom3-pocolibs/Makefile @@ -21,4 +21,5 @@ DEPEND_ABI.pocolibs= pocolibs>=2.11.99 include ../../middleware/pocolibs/depend.mk include ../../pkgtools/pkg-config/depend.mk include ../../wip/genom3/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/genom3/Makefile b/genom3/Makefile index 0a1f59ef..bb6404d3 100644 --- a/genom3/Makefile +++ b/genom3/Makefile @@ -29,4 +29,5 @@ include ../../mk/sysdep/bison.mk include ../../mk/sysdep/flex.mk include ../../mk/sysdep/tcl.mk include ../../mk/sysdep/texinfo.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/genomix/Makefile b/genomix/Makefile index 5a2a7628..89ad160b 100644 --- a/genomix/Makefile +++ b/genomix/Makefile @@ -21,4 +21,5 @@ DEPEND_ABI.tcl= tcl>=8.5 include ../../pkgtools/pkg-config/depend.mk include ../../wip/genom3/depend.mk include ../../mk/sysdep/tcl.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/hpp-geometry/Makefile b/hpp-geometry/Makefile index f108b004..8ae12726 100644 --- a/hpp-geometry/Makefile +++ b/hpp-geometry/Makefile @@ -19,4 +19,5 @@ CMAKE_ARGS+= -DGEOMETRIC_TOOLS_INSTALL_PREFIX:STRING=${PREFIX} include ../../devel/hpp-util/depend.mk include ../../math/geometric-tools/depend.mk include ../../path/kineo-pp/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/hri-simulation/Makefile b/hri-simulation/Makefile index 14b5f938..84f85e54 100644 --- a/hri-simulation/Makefile +++ b/hri-simulation/Makefile @@ -42,4 +42,5 @@ include ../../sysutils/alog/depend.mk include ../../net/py-poco/depend.mk include ../../mk/sysdep/python.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/jafar-qdisplay/Makefile b/jafar-qdisplay/Makefile index 3719d46a..b0dbaaac 100644 --- a/jafar-qdisplay/Makefile +++ b/jafar-qdisplay/Makefile @@ -18,4 +18,5 @@ include ../../math/boost-numeric-bindings/depend.mk include ../../pkgtools/libtool/depend.mk include ../../mk/sysdep/qt4-libs.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/jafar-rtslam/Makefile b/jafar-rtslam/Makefile index c71376f3..111f79d9 100644 --- a/jafar-rtslam/Makefile +++ b/jafar-rtslam/Makefile @@ -78,4 +78,5 @@ include ../../image/jafar-image/depend.mk include ../../math/jafar-jmath/depend.mk include ../../image/jafar-correl/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/jido-pick-object/Makefile b/jido-pick-object/Makefile index 89096ad8..2d316dcb 100644 --- a/jido-pick-object/Makefile +++ b/jido-pick-object/Makefile @@ -77,5 +77,6 @@ include ../../wip/spark-genom/depend.mk include ../../mk/sysdep/tcl.mk include ../../mk/sysdep/tk.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/joystick-genom/Makefile b/joystick-genom/Makefile index 900dfc02..0d95cc8a 100644 --- a/joystick-genom/Makefile +++ b/joystick-genom/Makefile @@ -15,4 +15,5 @@ GENOM_MODULE= joystick include ../../architecture/genom/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/laas-rackham/Makefile b/laas-rackham/Makefile index fdc84c2c..970fccb3 100644 --- a/laas-rackham/Makefile +++ b/laas-rackham/Makefile @@ -27,4 +27,5 @@ include ../../image/viam-genom/depend.mk include ../../hardware/platine-genom/depend.mk include ../../audio/clone-genom/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/laaswm-gui/Makefile b/laaswm-gui/Makefile index 0792d97a..2a58cc80 100644 --- a/laaswm-gui/Makefile +++ b/laaswm-gui/Makefile @@ -21,4 +21,5 @@ include ../../wip/py-laaswm/depend.mk include ../../mk/sysdep/python.mk include ../../mk/sysdep/py-setuptools.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/lastwave/Makefile b/lastwave/Makefile index 959a907b..1e052ff1 100644 --- a/lastwave/Makefile +++ b/lastwave/Makefile @@ -14,8 +14,9 @@ HOMEPAGE= http://www.cmap.polytechnique.fr/~bacry/LastWave/ COMMENT= LastWave is a signal processing oriented command language include ../../mk/sysdep/cmake.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk post-extract: ${CP} ${FILESDIR}/CMakeLists.txt ${WRKSRC} - ${CP} ${FILESDIR}/lastwave.pc.cmake ${WRKSRC} \ No newline at end of file + ${CP} ${FILESDIR}/lastwave.pc.cmake ${WRKSRC} diff --git a/libANN/Makefile b/libANN/Makefile index 9e49064e..174b3c38 100644 --- a/libANN/Makefile +++ b/libANN/Makefile @@ -21,6 +21,7 @@ BUILD_TARGET=unix-libtool include ../../pkgtools/libtool/depend.mk include ../../pkgtools/pax/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk do-install: diff --git a/morse-pocolibs/Makefile b/morse-pocolibs/Makefile index 19d6fec3..13ad1972 100644 --- a/morse-pocolibs/Makefile +++ b/morse-pocolibs/Makefile @@ -60,6 +60,7 @@ endef include ../../devel/swig/depend.mk include ../../middleware/pocolibs/depend.mk include ../../simulation/morse/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk _pycompile_dir=${PREFIX}/${PYTHON_SITELIB}/morse/middleware/pocolibs* diff --git a/move3d-assets/Makefile b/move3d-assets/Makefile index e0fd4b1d..405af6e3 100644 --- a/move3d-assets/Makefile +++ b/move3d-assets/Makefile @@ -35,6 +35,7 @@ NO_BUILD= yes include ../../pkgtools/pax/depend.mk include ../../pkgtools/install-sh/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk do-install: diff --git a/pr2-pick-object/Makefile b/pr2-pick-object/Makefile index 8586b2af..f4e972ae 100644 --- a/pr2-pick-object/Makefile +++ b/pr2-pick-object/Makefile @@ -77,5 +77,6 @@ include ../../graphics/laaswm-libs/depend.mk include ../../mk/sysdep/tcl.mk include ../../mk/sysdep/tk.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/py-laaswm/Makefile b/py-laaswm/Makefile index a68557be..8afc3fad 100644 --- a/py-laaswm/Makefile +++ b/py-laaswm/Makefile @@ -16,5 +16,6 @@ PYDISTUTILSPKG= ON include ../../mk/sysdep/python.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/tcl-genomix/Makefile b/tcl-genomix/Makefile index 07b82d6f..f9bdd327 100644 --- a/tcl-genomix/Makefile +++ b/tcl-genomix/Makefile @@ -19,4 +19,5 @@ NOT_FOR_PLATFORM= # empty DEPEND_ABI.tcl= tcl>=8.5 include ../../mk/sysdep/tcl.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/transgen3/Makefile b/transgen3/Makefile index 78835ed4..cabf48c7 100644 --- a/transgen3/Makefile +++ b/transgen3/Makefile @@ -19,4 +19,5 @@ include ../../wip/genom3/depend.mk include ../../supervision/openprs/depend.mk include ../../pkgtools/pkg-config/depend.mk include ../../mk/sysdep/java.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk diff --git a/viman-tags/Makefile b/viman-tags/Makefile index d4c5fa00..3738ca81 100644 --- a/viman-tags/Makefile +++ b/viman-tags/Makefile @@ -19,6 +19,7 @@ NO_BUILD= yes include ../../pkgtools/pax/depend.mk include ../../pkgtools/install-sh/depend.mk +include ../../mk/language/c.mk include ../../mk/robotpkg.mk do-install: -- GitLab