summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-11-04 16:39:36 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-11-04 16:39:36 +0100
commit82721f868895944823e34eb7c3e56f4bedb2a4ca (patch)
tree808279aa8028c40006bbc9608478023c094ea187 /classes
parentcea3d55fd2638484e9a560d0c04d9e8b8e80806c (diff)
parent8fedaafb39b5664ea964e8aabf2c22795e4fff3c (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
-rw-r--r--classes/e.bbclass2
-rw-r--r--classes/efl.bbclass9
2 files changed, 6 insertions, 5 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass
index a6fa1d0d78..fca9aa0010 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -23,7 +23,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
# This construction is stupid, someone with more E knowledge should change it to =+ or something
# And it's in efl.bbclass as well....
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib ${PN}-static"
FILES_${PN}-lib = "${libdir}/lib*.so.*"
FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index 22e664ce01..d4c3baa9cf 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -24,7 +24,7 @@ do_stage() {
}
# This construction is stupid, someone with more E knowledge should change it to =+ or something
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests ${PN}-static"
FILES_${PN} = "${libdir}/*.so.*"
@@ -40,13 +40,14 @@ FILES_${PN}-themes = "${datadir}/${PN}/themes \
FILES_${PN}-dev += "${bindir}/${PN}-config \
${libdir}/pkgconfig/* \
${libdir}/lib*.la \
- ${libdir}/lib*.a \
${libdir}/*.so \
- ${libdir}/${PN}/*.a \
${libdir}/${PN}/*.la \
- ${libdir}/${PN}/*/*.a \
${libdir}/${PN}/*/*.la"
+FILES_${PN}-static += "${libdir}/${PN}/*.a \
+ ${libdir}/${PN}/*/*.a \
+"
+
FILES_${PN}-dbg += "${libdir}/${PN}/.debug \
${libdir}/${PN}/*/.debug"