diff options
| author | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-09 13:56:34 -0800 |
|---|---|---|
| committer | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-09 13:56:34 -0800 |
| commit | 9f3d14a2fca85f99f2b7bb881e4be736fe266685 (patch) | |
| tree | c2cda9e741c76a7a8c87c3c53263a27690531eb4 /recipes-qt/qt5/qtdeclarative.inc | |
| parent | 14f60829d8e3df70327b51e729fc68f833a5e333 (diff) | |
qtdeclarative: packaging update and recipe cleanup
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative.inc')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative.inc | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index aaada23e..bf904753 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -11,10 +11,6 @@ SRC_URI += " \ file://module_qmake.conf \ " -# Bitbake will not respect the make order set by qmake and at times it will try to compile -# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail -#PARALLEL_MAKE = "" - export QT_CONF_PATH="${WORKDIR}/qt.conf" do_configure () { @@ -25,15 +21,25 @@ do_configure () { # of an error on the native recipe... cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf - ${OE_QMAKE_QMAKE} -d + ${OE_QMAKE_QMAKE} -r -d } do_install() { oe_runmake install INSTALL_ROOT=${D} } -FILES_${PN}-dev += "\ - ${STAGING_INCDIR}/qt5 \ - ${STAGING_DATADIR}/qt5 \ +FILES_${PN}-dev = "\ + ${includedir}/qt5/* \ + ${datadir}/qt5/mkspecs/* \ ${libdir}/*.prl \ + ${libdir}/cmake/* \ + ${libdir}/pkgconfig/*.pc \ " + +FILES_${PN}-staticdev = "${libdir}/*.la" +FILES_${PN}-tools = "${bindir}/*" +FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*" +FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*" +FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*" + +PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg"
\ No newline at end of file |