summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-04-27 10:07:31 +0200
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-04-28 09:11:53 +0200
commit256bbbe03128e10d8d0432edfec2c8f203f20f7c (patch)
treed05ecca03fd77fe9e8d29a9c67f64657b36c791f /classes
parenta23c4cc90bb9505a5a3446790538e65a512bfe40 (diff)
vala / freesmartphone: vala now also looks in the target directory for vapi files
We can finally inherit autotools now and remove legacy staging
Diffstat (limited to 'classes')
-rw-r--r--classes/vala.bbclass16
1 files changed, 6 insertions, 10 deletions
diff --git a/classes/vala.bbclass b/classes/vala.bbclass
index 433b64e87e..3510a8acf3 100644
--- a/classes/vala.bbclass
+++ b/classes/vala.bbclass
@@ -1,19 +1,15 @@
# Vala has problems with multiple concurrent invocations
PARALLEL_MAKE = ""
+# Vala needs vala-native
DEPENDS += "vala-native"
+# Vala looks in STAGING_DATADIR for .vapi files
+export STAGING_DATADIR
+
+# Package additional files
FILES_${PN}-dev += "\
${datadir}/vala/vapi/*.vapi \
${datadir}/vala/vapi/*.deps \
+ ${datadir}/gir-1.0 \
"
-
-VALA_DONT_STAGE_VAPIS ?= "\(/config.vapi$\)\|\(/config.deps$\)"
-
-# .vapi and .deps files are arch independent and need to be present in the
-# staging datadir for the native vala compiler
-do_stage_append() {
- install -d ${STAGING_DATADIR_NATIVE}/vala/vapi
- for VALAFILE in `find . -name "*.vapi" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
- for VALAFILE in `find . -name "*.deps" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
-}