diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-03-30 17:54:03 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-03-30 17:54:03 +0000 |
commit | ab20b078fd1c994c96748c12d83dfaec376af3dd (patch) | |
tree | 97b5ca9652383045f35cc822d0609ea9869508ad /classes | |
parent | f2ddbcc43d7515d14d9d7ffb6d6b6ed3dcd1881d (diff) | |
parent | d94cd14b70790a834f87ad0f72c7e9e6020b8da9 (diff) |
merge of '9a1d9f4131082cd791aff8dde0d0aebb1b108a06'
and 'e7e5983b231f05cb82978173bc4562e70543fd6a'
Diffstat (limited to 'classes')
-rw-r--r-- | classes/opie.bbclass | 4 | ||||
-rw-r--r-- | classes/palmtop.bbclass | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 92cde5487b..915de890cf 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -19,10 +19,6 @@ OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}" DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}" -FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \ - ${palmtopdir}/bin/.debug \ - ${palmtopdir}/plugins/*/.debug " - # to be consistent, put all targets into workdir # NOTE: leave one space at the end, other files are expecting that EXTRA_QMAKEVARS_POST += "DESTDIR=${S} " diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass index b4bd21ab25..39b9bd2b60 100644 --- a/classes/palmtop.bbclass +++ b/classes/palmtop.bbclass @@ -17,4 +17,9 @@ EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "ye EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" -FILES_${PN} = "${palmtopdir}" +PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" +FILES_${PN} = " ${palmtopdir} " +FILES_${PN}-dev += " ${palmtopdir}/lib/lib*.so " +FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \ + ${palmtopdir}/bin/.debug \ + ${palmtopdir}/plugins/*/.debug " |