---
fsodatad/src/bin/Makefile.am | 1 +
fsodatad/src/lib/Makefile.am | 1 +
fsodatad/src/plugins/world/Makefile.am | 1 +
fsodatad/tests/Makefile.am | 1 +
fsodeviced/src/bin/Makefile.am | 1 +
fsodeviced/src/lib/Makefile.am | 1 +
fsodeviced/src/plugins/accelerometer/Makefile.am | 1 +
.../src/plugins/accelerometer_kxsd9/Makefile.am | 1 +
.../src/plugins/accelerometer_lis302/Makefile.am | 1 +
.../src/plugins/ambientlight_palmpre/Makefile.am | 1 +
fsodeviced/src/plugins/audio/Makefile.am | 1 +
.../src/plugins/backlight_omappanel/Makefile.am | 1 +
.../src/plugins/kernel26_display/Makefile.am | 1 +
.../plugins/kernel26_firmwareloader/Makefile.am | 1 +
fsodeviced/src/plugins/kernel26_leds/Makefile.am | 1 +
.../src/plugins/kernel26_powersupply/Makefile.am | 1 +
fsodeviced/src/plugins/kernel26_rfkill/Makefile.am | 1 +
fsodeviced/src/plugins/kernel26_rtc/Makefile.am | 1 +
fsodeviced/src/plugins/kernel_idle/Makefile.am | 1 +
fsodeviced/src/plugins/kernel_info/Makefile.am | 1 +
fsodeviced/src/plugins/kernel_input/Makefile.am | 1 +
.../src/plugins/openmoko_powercontrol/Makefile.am | 1 +
.../src/plugins/palmpre_powersupply/Makefile.am | 1 +
fsodeviced/src/plugins/player_alsa/Makefile.am | 1 +
fsodeviced/src/plugins/player_canberra/Makefile.am | 1 +
.../src/plugins/player_gstreamer/Makefile.am | 1 +
.../src/plugins/powercontrol_ifconfig/Makefile.am | 1 +
fsodeviced/src/plugins/proximity_n900/Makefile.am | 1 +
.../src/plugins/proximity_palmpre/Makefile.am | 1 +
fsodeviced/src/plugins/router_alsa/Makefile.am | 1 +
fsodeviced/src/plugins/router_palmpre/Makefile.am | 1 +
fsodeviced/src/plugins/router_qdsp5/Makefile.am | 1 +
.../src/plugins/thinkpad_powercontrol/Makefile.am | 1 +
.../src/plugins/vibrator_ledclass/Makefile.am | 1 +
.../src/plugins/vibrator_omapvibe/Makefile.am | 1 +
.../plugins/vibrator_timedoutputclass/Makefile.am | 1 +
fsodeviced/tests/Makefile.am | 1 +
fsogsmd/src/bin/Makefile.am | 1 +
fsogsmd/src/lib/Makefile.am | 1 +
fsogsmd/src/plugins/dbus_service/Makefile.am | 1 +
.../src/plugins/lowlevel_motorola_ezx/Makefile.am | 1 +
fsogsmd/src/plugins/lowlevel_openmoko/Makefile.am | 1 +
fsogsmd/src/plugins/lowlevel_palmpre/Makefile.am | 1 +
.../src/plugins/modem_cinterion_mc75/Makefile.am | 1 +
fsogsmd/src/plugins/modem_dummy/Makefile.am | 1 +
.../plugins/modem_freescale_neptune/Makefile.am | 1 +
fsogsmd/src/plugins/modem_qualcomm_htc/Makefile.am | 1 +
.../src/plugins/modem_qualcomm_palm/Makefile.am | 1 +
fsogsmd/src/plugins/modem_singleline/Makefile.am | 1 +
fsogsmd/src/plugins/modem_ti_calypso/Makefile.am | 1 +
fsogsmd/src/plugins/pdp_ppp/Makefile.am | 1 +
fsogsmd/src/plugins/pdp_ppp_mux/Makefile.am | 1 +
fsogsmd/src/plugins/pdp_qmi/Makefile.am | 1 +
fsogsmd/src/ppp/Makefile.am | 1 +
fsogsmd/tests/Makefile.am | 1 +
fsoinitd/src/Makefile.am | 1 +
fsomusicd/src/Makefile.am | 1 +
fsonetworkd/src/bin/Makefile.am | 1 +
fsonetworkd/src/lib/Makefile.am | 1 +
fsonetworkd/src/plugins/sharing/Makefile.am | 1 +
fsotdld/src/bin/Makefile.am | 1 +
fsotdld/src/lib/Makefile.am | 1 +
fsotdld/src/plugins/alarm/Makefile.am | 1 +
fsotdld/src/plugins/location/Makefile.am | 1 +
fsotdld/src/plugins/provider_gps/Makefile.am | 1 +
fsotdld/src/plugins/provider_gps_nmea/Makefile.am | 1 +
.../provider_location_freegeoip/Makefile.am | 1 +
fsotdld/src/plugins/source_dummy/Makefile.am | 1 +
fsotdld/src/plugins/source_gps/Makefile.am | 1 +
fsotdld/src/plugins/source_gsm/Makefile.am | 1 +
fsotdld/src/plugins/source_ntp/Makefile.am | 1 +
fsotdld/src/plugins/sync_time/Makefile.am | 1 +
fsotdld/tests/Makefile.am | 1 +
fsousaged/src/bin/Makefile.am | 1 +
fsousaged/src/lib/Makefile.am | 1 +
fsousaged/src/plugins/dbus_service/Makefile.am | 1 +
fsousaged/src/plugins/lowlevel_android/Makefile.am | 1 +
.../src/plugins/lowlevel_kernel26/Makefile.am | 1 +
.../lowlevel_kernel26_staysalive/Makefile.am | 1 +
.../src/plugins/lowlevel_openmoko/Makefile.am | 1 +
fsousaged/src/plugins/lowlevel_palmpre/Makefile.am | 1 +
fsousaged/tests/Makefile.am | 1 +
libfsobasics/tests/Makefile.am | 1 +
libfsoframework/fsoframework/Makefile.am | 1 +
libfsoframework/tests/Makefile.am | 1 +
libfsoresource/fsoresource/Makefile.am | 1 +
libfsoresource/tests/Makefile.am | 1 +
libfsotransport/fsotransport/Makefile.am | 1 +
libfsotransport/tests/Makefile.am | 1 +
libgsm0710mux/Makefile.am | 1 +
tools/fso-abyss/Makefile.am | 1 +
tools/fso-alsa/src/Makefile.am | 1 +
tools/mkdump/Makefile.am | 1 +
tools/mterm2/Makefile.am | 1 +
94 files changed, 94 insertions(+), 0 deletions(-)
diff --git a/fsodatad/src/bin/Makefile.am b/fsodatad/src/bin/Makefile.am
index 306108d..e5f2cdf 100644
--- a/fsodatad/src/bin/Makefile.am
+++ b/fsodatad/src/bin/Makefile.am
@@ -22,6 +22,7 @@ fsodatad_SOURCES = \
$(BUILT_SOURCES): $(fsodatad_VALASOURCES)
$(VALAC) -C --vapidir vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg gio-2.0 \
--pkg dbus-glib-1 \
diff --git a/fsodatad/src/lib/Makefile.am b/fsodatad/src/lib/Makefile.am
index ba9b29c..054766a 100644
--- a/fsodatad/src/lib/Makefile.am
+++ b/fsodatad/src/lib/Makefile.am
@@ -13,6 +13,7 @@ AM_CFLAGS = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gio-2.0 \
--pkg gee-1.0 \
diff --git a/fsodatad/src/plugins/world/Makefile.am
b/fsodatad/src/plugins/world/Makefile.am
index 140e2b0..4b38fe6 100644
--- a/fsodatad/src/plugins/world/Makefile.am
+++ b/fsodatad/src/plugins/world/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gee-1.0 \
--pkg dbus-glib-1 \
diff --git a/fsodatad/tests/Makefile.am b/fsodatad/tests/Makefile.am
index f2734f4..19858b9 100644
--- a/fsodatad/tests/Makefile.am
+++ b/fsodatad/tests/Makefile.am
@@ -22,6 +22,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gio-2.0 \
diff --git a/fsodeviced/src/bin/Makefile.am b/fsodeviced/src/bin/Makefile.am
index 988cbd1..f04e87c 100644
--- a/fsodeviced/src/bin/Makefile.am
+++ b/fsodeviced/src/bin/Makefile.am
@@ -22,6 +22,7 @@ fsodeviced_SOURCES = \
$(BUILT_SOURCES): $(fsodeviced_VALASOURCES)
$(VALAC) -C --vapidir vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg gio-2.0 \
--pkg dbus-glib-1 \
diff --git a/fsodeviced/src/lib/Makefile.am b/fsodeviced/src/lib/Makefile.am
index 32ee503..150a5f0 100644
--- a/fsodeviced/src/lib/Makefile.am
+++ b/fsodeviced/src/lib/Makefile.am
@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg alsa \
--pkg glib-2.0 \
diff --git a/fsodeviced/src/plugins/accelerometer/Makefile.am
b/fsodeviced/src/plugins/accelerometer/Makefile.am
index 62d3113..3291e30 100644
--- a/fsodeviced/src/plugins/accelerometer/Makefile.am
+++ b/fsodeviced/src/plugins/accelerometer/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg linux \
diff --git a/fsodeviced/src/plugins/accelerometer_kxsd9/Makefile.am
b/fsodeviced/src/plugins/accelerometer_kxsd9/Makefile.am
index 6f8fd40..deb3cb3 100644
--- a/fsodeviced/src/plugins/accelerometer_kxsd9/Makefile.am
+++ b/fsodeviced/src/plugins/accelerometer_kxsd9/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ./ \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/src/lib \
--pkg linux \
--pkg glib-2.0 \
diff --git a/fsodeviced/src/plugins/accelerometer_lis302/Makefile.am
b/fsodeviced/src/plugins/accelerometer_lis302/Makefile.am
index 69fadbb..b56ec68 100644
--- a/fsodeviced/src/plugins/accelerometer_lis302/Makefile.am
+++ b/fsodeviced/src/plugins/accelerometer_lis302/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ./ \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/src/lib \
--pkg linux \
--pkg glib-2.0 \
diff --git a/fsodeviced/src/plugins/ambientlight_palmpre/Makefile.am
b/fsodeviced/src/plugins/ambientlight_palmpre/Makefile.am
index 350ee94..a9d128b 100644
--- a/fsodeviced/src/plugins/ambientlight_palmpre/Makefile.am
+++ b/fsodeviced/src/plugins/ambientlight_palmpre/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/audio/Makefile.am
b/fsodeviced/src/plugins/audio/Makefile.am
index 3eddfa2..dbb201e 100644
--- a/fsodeviced/src/plugins/audio/Makefile.am
+++ b/fsodeviced/src/plugins/audio/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gee-1.0 \
--pkg dbus-glib-1 \
diff --git a/fsodeviced/src/plugins/backlight_omappanel/Makefile.am
b/fsodeviced/src/plugins/backlight_omappanel/Makefile.am
index 6235b5f..ecfe08d 100644
--- a/fsodeviced/src/plugins/backlight_omappanel/Makefile.am
+++ b/fsodeviced/src/plugins/backlight_omappanel/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/kernel26_display/Makefile.am
b/fsodeviced/src/plugins/kernel26_display/Makefile.am
index 5c7c0c0..27ae10b 100644
--- a/fsodeviced/src/plugins/kernel26_display/Makefile.am
+++ b/fsodeviced/src/plugins/kernel26_display/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/kernel26_firmwareloader/Makefile.am
b/fsodeviced/src/plugins/kernel26_firmwareloader/Makefile.am
index c4cbe21..6c3279d 100644
--- a/fsodeviced/src/plugins/kernel26_firmwareloader/Makefile.am
+++ b/fsodeviced/src/plugins/kernel26_firmwareloader/Makefile.am
@@ -20,6 +20,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/vapi \
--pkg linux \
--pkg glib-2.0 \
diff --git a/fsodeviced/src/plugins/kernel26_leds/Makefile.am
b/fsodeviced/src/plugins/kernel26_leds/Makefile.am
index 8917b28..a6ca0a6 100644
--- a/fsodeviced/src/plugins/kernel26_leds/Makefile.am
+++ b/fsodeviced/src/plugins/kernel26_leds/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/kernel26_powersupply/Makefile.am
b/fsodeviced/src/plugins/kernel26_powersupply/Makefile.am
index 578b835..62f86e2 100644
--- a/fsodeviced/src/plugins/kernel26_powersupply/Makefile.am
+++ b/fsodeviced/src/plugins/kernel26_powersupply/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg linux \
diff --git a/fsodeviced/src/plugins/kernel26_rfkill/Makefile.am
b/fsodeviced/src/plugins/kernel26_rfkill/Makefile.am
index 8f50aaa..897a623 100644
--- a/fsodeviced/src/plugins/kernel26_rfkill/Makefile.am
+++ b/fsodeviced/src/plugins/kernel26_rfkill/Makefile.am
@@ -20,6 +20,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/vapi \
--pkg linux \
--pkg glib-2.0 \
diff --git a/fsodeviced/src/plugins/kernel26_rtc/Makefile.am
b/fsodeviced/src/plugins/kernel26_rtc/Makefile.am
index 87da897..8580e63 100644
--- a/fsodeviced/src/plugins/kernel26_rtc/Makefile.am
+++ b/fsodeviced/src/plugins/kernel26_rtc/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg linux \
diff --git a/fsodeviced/src/plugins/kernel_idle/Makefile.am
b/fsodeviced/src/plugins/kernel_idle/Makefile.am
index 0211552..2852048 100644
--- a/fsodeviced/src/plugins/kernel_idle/Makefile.am
+++ b/fsodeviced/src/plugins/kernel_idle/Makefile.am
@@ -16,6 +16,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg linux \
diff --git a/fsodeviced/src/plugins/kernel_info/Makefile.am
b/fsodeviced/src/plugins/kernel_info/Makefile.am
index 6543332..b6b2679 100644
--- a/fsodeviced/src/plugins/kernel_info/Makefile.am
+++ b/fsodeviced/src/plugins/kernel_info/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg linux \
diff --git a/fsodeviced/src/plugins/kernel_input/Makefile.am
b/fsodeviced/src/plugins/kernel_input/Makefile.am
index ee753c3..76e35b1 100644
--- a/fsodeviced/src/plugins/kernel_input/Makefile.am
+++ b/fsodeviced/src/plugins/kernel_input/Makefile.am
@@ -19,6 +19,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gee-1.0 \
--pkg dbus-glib-1 \
diff --git a/fsodeviced/src/plugins/openmoko_powercontrol/Makefile.am
b/fsodeviced/src/plugins/openmoko_powercontrol/Makefile.am
index 01616b4..f2e9bb1 100644
--- a/fsodeviced/src/plugins/openmoko_powercontrol/Makefile.am
+++ b/fsodeviced/src/plugins/openmoko_powercontrol/Makefile.am
@@ -20,6 +20,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/palmpre_powersupply/Makefile.am
b/fsodeviced/src/plugins/palmpre_powersupply/Makefile.am
index bd2b038..483fc54 100644
--- a/fsodeviced/src/plugins/palmpre_powersupply/Makefile.am
+++ b/fsodeviced/src/plugins/palmpre_powersupply/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg linux \
diff --git a/fsodeviced/src/plugins/player_alsa/Makefile.am
b/fsodeviced/src/plugins/player_alsa/Makefile.am
index 11f1218..656e773 100644
--- a/fsodeviced/src/plugins/player_alsa/Makefile.am
+++ b/fsodeviced/src/plugins/player_alsa/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gee-1.0 \
--pkg dbus-glib-1 \
diff --git a/fsodeviced/src/plugins/player_canberra/Makefile.am
b/fsodeviced/src/plugins/player_canberra/Makefile.am
index b28a9ed..14b3428 100644
--- a/fsodeviced/src/plugins/player_canberra/Makefile.am
+++ b/fsodeviced/src/plugins/player_canberra/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gee-1.0 \
--pkg dbus-glib-1 \
diff --git a/fsodeviced/src/plugins/player_gstreamer/Makefile.am
b/fsodeviced/src/plugins/player_gstreamer/Makefile.am
index 3fa9f99..f133823 100644
--- a/fsodeviced/src/plugins/player_gstreamer/Makefile.am
+++ b/fsodeviced/src/plugins/player_gstreamer/Makefile.am
@@ -24,6 +24,7 @@ VALAC_ARGS = \
--thread \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/vapi \
--pkg thread \
--pkg gstreamer-0.10 \
diff --git a/fsodeviced/src/plugins/powercontrol_ifconfig/Makefile.am
b/fsodeviced/src/plugins/powercontrol_ifconfig/Makefile.am
index 9661964..b4a9f7d 100644
--- a/fsodeviced/src/plugins/powercontrol_ifconfig/Makefile.am
+++ b/fsodeviced/src/plugins/powercontrol_ifconfig/Makefile.am
@@ -20,6 +20,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
diff --git a/fsodeviced/src/plugins/proximity_n900/Makefile.am
b/fsodeviced/src/plugins/proximity_n900/Makefile.am
index 66276d3..0a05f21 100644
--- a/fsodeviced/src/plugins/proximity_n900/Makefile.am
+++ b/fsodeviced/src/plugins/proximity_n900/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/proximity_palmpre/Makefile.am
b/fsodeviced/src/plugins/proximity_palmpre/Makefile.am
index d45db25..98e545b 100644
--- a/fsodeviced/src/plugins/proximity_palmpre/Makefile.am
+++ b/fsodeviced/src/plugins/proximity_palmpre/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/router_alsa/Makefile.am
b/fsodeviced/src/plugins/router_alsa/Makefile.am
index e631183..4ba8709 100644
--- a/fsodeviced/src/plugins/router_alsa/Makefile.am
+++ b/fsodeviced/src/plugins/router_alsa/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gee-1.0 \
--pkg dbus-glib-1 \
diff --git a/fsodeviced/src/plugins/router_palmpre/Makefile.am
b/fsodeviced/src/plugins/router_palmpre/Makefile.am
index 0bc6559..25b8bf8 100644
--- a/fsodeviced/src/plugins/router_palmpre/Makefile.am
+++ b/fsodeviced/src/plugins/router_palmpre/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--vapidir . \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsodeviced/src/plugins/router_qdsp5/Makefile.am
b/fsodeviced/src/plugins/router_qdsp5/Makefile.am
index 5605ff3..c4cb9d2 100644
--- a/fsodeviced/src/plugins/router_qdsp5/Makefile.am
+++ b/fsodeviced/src/plugins/router_qdsp5/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--vapidir . \
--pkg playwav2 \
--pkg glib-2.0 \
diff --git a/fsodeviced/src/plugins/thinkpad_powercontrol/Makefile.am
b/fsodeviced/src/plugins/thinkpad_powercontrol/Makefile.am
index 1271200..9e71e1a 100644
--- a/fsodeviced/src/plugins/thinkpad_powercontrol/Makefile.am
+++ b/fsodeviced/src/plugins/thinkpad_powercontrol/Makefile.am
@@ -20,6 +20,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/vibrator_ledclass/Makefile.am
b/fsodeviced/src/plugins/vibrator_ledclass/Makefile.am
index 5d3de77..f9774fd 100644
--- a/fsodeviced/src/plugins/vibrator_ledclass/Makefile.am
+++ b/fsodeviced/src/plugins/vibrator_ledclass/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/vibrator_omapvibe/Makefile.am
b/fsodeviced/src/plugins/vibrator_omapvibe/Makefile.am
index f5864dd..1a31b93 100644
--- a/fsodeviced/src/plugins/vibrator_omapvibe/Makefile.am
+++ b/fsodeviced/src/plugins/vibrator_omapvibe/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/src/plugins/vibrator_timedoutputclass/Makefile.am
b/fsodeviced/src/plugins/vibrator_timedoutputclass/Makefile.am
index 2ae62bb..6c3eae8 100644
--- a/fsodeviced/src/plugins/vibrator_timedoutputclass/Makefile.am
+++ b/fsodeviced/src/plugins/vibrator_timedoutputclass/Makefile.am
@@ -15,6 +15,7 @@ progs_ldadd = $(FSO_LIBS) $(DBUS_LIBS)
$(top_srcdir)/src/lib/libfsodevice.la
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fso-glib-1.0 \
diff --git a/fsodeviced/tests/Makefile.am b/fsodeviced/tests/Makefile.am
index a90bd90..7a63b40 100644
--- a/fsodeviced/tests/Makefile.am
+++ b/fsodeviced/tests/Makefile.am
@@ -12,6 +12,7 @@ VALAC_ARGS = \
-C \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gio-2.0 \
diff --git a/fsogsmd/src/bin/Makefile.am b/fsogsmd/src/bin/Makefile.am
index b80eaa6..1ed6c05 100644
--- a/fsogsmd/src/bin/Makefile.am
+++ b/fsogsmd/src/bin/Makefile.am
@@ -22,6 +22,7 @@ fsogsmd_SOURCES = \
$(BUILT_SOURCES): $(fsogsmd_VALASOURCES)
$(VALAC) -C --vapidir vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg gio-2.0 \
--pkg dbus-glib-1 \
diff --git a/fsogsmd/src/lib/Makefile.am b/fsogsmd/src/lib/Makefile.am
index f284a3c..0e46158 100644
--- a/fsogsmd/src/lib/Makefile.am
+++ b/fsogsmd/src/lib/Makefile.am
@@ -22,6 +22,7 @@ AM_CFLAGS = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/src/lib \
--pkg dbus-glib-1 \
--pkg glib-2.0 \
diff --git a/fsogsmd/src/plugins/dbus_service/Makefile.am
b/fsogsmd/src/plugins/dbus_service/Makefile.am
index 1ef93e7..1cdfe04 100644
--- a/fsogsmd/src/plugins/dbus_service/Makefile.am
+++ b/fsogsmd/src/plugins/dbus_service/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsogsmd/src/plugins/lowlevel_motorola_ezx/Makefile.am
b/fsogsmd/src/plugins/lowlevel_motorola_ezx/Makefile.am
index 006e365..116ba72 100644
--- a/fsogsmd/src/plugins/lowlevel_motorola_ezx/Makefile.am
+++ b/fsogsmd/src/plugins/lowlevel_motorola_ezx/Makefile.am
@@ -18,6 +18,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg fsoframework-2.0 \
--pkg fsogsm-2.0
diff --git a/fsogsmd/src/plugins/lowlevel_openmoko/Makefile.am
b/fsogsmd/src/plugins/lowlevel_openmoko/Makefile.am
index 87e1ad2..7a0c210 100644
--- a/fsogsmd/src/plugins/lowlevel_openmoko/Makefile.am
+++ b/fsogsmd/src/plugins/lowlevel_openmoko/Makefile.am
@@ -18,6 +18,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg fsoframework-2.0 \
--pkg fsogsm-2.0
diff --git a/fsogsmd/src/plugins/lowlevel_palmpre/Makefile.am
b/fsogsmd/src/plugins/lowlevel_palmpre/Makefile.am
index 711cf67..fa60c7c 100644
--- a/fsogsmd/src/plugins/lowlevel_palmpre/Makefile.am
+++ b/fsogsmd/src/plugins/lowlevel_palmpre/Makefile.am
@@ -18,6 +18,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg fsoframework-2.0 \
--pkg fsogsm-2.0
diff --git a/fsogsmd/src/plugins/modem_cinterion_mc75/Makefile.am
b/fsogsmd/src/plugins/modem_cinterion_mc75/Makefile.am
index 9039fe1..03e4a78 100644
--- a/fsogsmd/src/plugins/modem_cinterion_mc75/Makefile.am
+++ b/fsogsmd/src/plugins/modem_cinterion_mc75/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsogsmd/src/plugins/modem_dummy/Makefile.am
b/fsogsmd/src/plugins/modem_dummy/Makefile.am
index 30ca899..e60d96d 100644
--- a/fsogsmd/src/plugins/modem_dummy/Makefile.am
+++ b/fsogsmd/src/plugins/modem_dummy/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsogsmd/src/plugins/modem_freescale_neptune/Makefile.am
b/fsogsmd/src/plugins/modem_freescale_neptune/Makefile.am
index 3aeffb1..2332cb0 100644
--- a/fsogsmd/src/plugins/modem_freescale_neptune/Makefile.am
+++ b/fsogsmd/src/plugins/modem_freescale_neptune/Makefile.am
@@ -25,6 +25,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsogsmd/src/plugins/modem_qualcomm_htc/Makefile.am
b/fsogsmd/src/plugins/modem_qualcomm_htc/Makefile.am
index defba4f..8b7d882 100644
--- a/fsogsmd/src/plugins/modem_qualcomm_htc/Makefile.am
+++ b/fsogsmd/src/plugins/modem_qualcomm_htc/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsogsmd/src/plugins/modem_qualcomm_palm/Makefile.am
b/fsogsmd/src/plugins/modem_qualcomm_palm/Makefile.am
index 78237c4..f686a60 100644
--- a/fsogsmd/src/plugins/modem_qualcomm_palm/Makefile.am
+++ b/fsogsmd/src/plugins/modem_qualcomm_palm/Makefile.am
@@ -25,6 +25,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsogsmd/src/plugins/modem_singleline/Makefile.am
b/fsogsmd/src/plugins/modem_singleline/Makefile.am
index f07ae75..e39b5b3 100644
--- a/fsogsmd/src/plugins/modem_singleline/Makefile.am
+++ b/fsogsmd/src/plugins/modem_singleline/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsogsmd/src/plugins/modem_ti_calypso/Makefile.am
b/fsogsmd/src/plugins/modem_ti_calypso/Makefile.am
index 52107ce..7ffdad1 100644
--- a/fsogsmd/src/plugins/modem_ti_calypso/Makefile.am
+++ b/fsogsmd/src/plugins/modem_ti_calypso/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsogsmd/src/plugins/pdp_ppp/Makefile.am
b/fsogsmd/src/plugins/pdp_ppp/Makefile.am
index a44bf73..1d4c980 100644
--- a/fsogsmd/src/plugins/pdp_ppp/Makefile.am
+++ b/fsogsmd/src/plugins/pdp_ppp/Makefile.am
@@ -18,6 +18,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg fsoframework-2.0 \
--pkg fsogsm-2.0
diff --git a/fsogsmd/src/plugins/pdp_ppp_mux/Makefile.am
b/fsogsmd/src/plugins/pdp_ppp_mux/Makefile.am
index 3fe36f9..b7d6a89 100644
--- a/fsogsmd/src/plugins/pdp_ppp_mux/Makefile.am
+++ b/fsogsmd/src/plugins/pdp_ppp_mux/Makefile.am
@@ -18,6 +18,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg fsoframework-2.0 \
--pkg fsogsm-2.0
diff --git a/fsogsmd/src/plugins/pdp_qmi/Makefile.am
b/fsogsmd/src/plugins/pdp_qmi/Makefile.am
index 7273231..efe0cd7 100644
--- a/fsogsmd/src/plugins/pdp_qmi/Makefile.am
+++ b/fsogsmd/src/plugins/pdp_qmi/Makefile.am
@@ -18,6 +18,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/vapi \
--thread \
--pkg thread \
diff --git a/fsogsmd/src/ppp/Makefile.am b/fsogsmd/src/ppp/Makefile.am
index 2d4cf8b..fd153d7 100644
--- a/fsogsmd/src/ppp/Makefile.am
+++ b/fsogsmd/src/ppp/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/vapi \
--pkg ppp \
--pkg glib-2.0 \
diff --git a/fsogsmd/tests/Makefile.am b/fsogsmd/tests/Makefile.am
index df7c0eb..b297b8a 100644
--- a/fsogsmd/tests/Makefile.am
+++ b/fsogsmd/tests/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gio-2.0 \
diff --git a/fsoinitd/src/Makefile.am b/fsoinitd/src/Makefile.am
index d38d985..21f87a0 100644
--- a/fsoinitd/src/Makefile.am
+++ b/fsoinitd/src/Makefile.am
@@ -5,6 +5,7 @@ NULL =
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg util \
--pkg gee-1.0 \
--pkg posix \
diff --git a/fsomusicd/src/Makefile.am b/fsomusicd/src/Makefile.am
index 215aa76..5bf8a01 100644
--- a/fsomusicd/src/Makefile.am
+++ b/fsomusicd/src/Makefile.am
@@ -42,6 +42,7 @@ fsomusicd_SOURCES = \
--pkg fso-glib-1.0 \
--pkg gee-1.0 \
--vapidir=. \
+ --vapidir $(datadir)/vala/vapi \
--save-temps $^
touch $@
diff --git a/fsonetworkd/src/bin/Makefile.am b/fsonetworkd/src/bin/Makefile.am
index 1133e32..f102baa 100644
--- a/fsonetworkd/src/bin/Makefile.am
+++ b/fsonetworkd/src/bin/Makefile.am
@@ -22,6 +22,7 @@ fsonetworkd_SOURCES = \
$(BUILT_SOURCES): $(fsonetworkd_VALASOURCES)
$(VALAC) -C --vapidir vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg gio-2.0 \
--pkg dbus-glib-1 \
diff --git a/fsonetworkd/src/lib/Makefile.am b/fsonetworkd/src/lib/Makefile.am
index cb1a5ec..afda117 100644
--- a/fsonetworkd/src/lib/Makefile.am
+++ b/fsonetworkd/src/lib/Makefile.am
@@ -30,6 +30,7 @@ fsonetworkinclude_HEADERS = fsonetwork.h
$(BUILT_SOURCES): $(libfsonetwork_la_VALASOURCES)
$(VALAC) -C --basedir $(top_srcdir) \
--vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gio-2.0 \
--pkg fsoframework-2.0 \
diff --git a/fsonetworkd/src/plugins/sharing/Makefile.am
b/fsonetworkd/src/plugins/sharing/Makefile.am
index 8e6a4aa..68a4ae1 100644
--- a/fsonetworkd/src/plugins/sharing/Makefile.am
+++ b/fsonetworkd/src/plugins/sharing/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
--pkg fsoframework-2.0 \
diff --git a/fsotdld/src/bin/Makefile.am b/fsotdld/src/bin/Makefile.am
index 9559e58..0fc2354 100644
--- a/fsotdld/src/bin/Makefile.am
+++ b/fsotdld/src/bin/Makefile.am
@@ -22,6 +22,7 @@ fsotdld_SOURCES = \
$(BUILT_SOURCES): $(fsotdld_VALASOURCES)
$(VALAC) -C --vapidir vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg gio-2.0 \
--pkg dbus-glib-1 \
diff --git a/fsotdld/src/lib/Makefile.am b/fsotdld/src/lib/Makefile.am
index f96e1f7..8b0946b 100644
--- a/fsotdld/src/lib/Makefile.am
+++ b/fsotdld/src/lib/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gio-2.0 \
--pkg gee-1.0 \
diff --git a/fsotdld/src/plugins/alarm/Makefile.am
b/fsotdld/src/plugins/alarm/Makefile.am
index b6eed88..20b63a1 100644
--- a/fsotdld/src/plugins/alarm/Makefile.am
+++ b/fsotdld/src/plugins/alarm/Makefile.am
@@ -22,6 +22,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gee-1.0 \
--pkg dbus-glib-1 \
diff --git a/fsotdld/src/plugins/location/Makefile.am
b/fsotdld/src/plugins/location/Makefile.am
index 90b5d24..a0a6076 100644
--- a/fsotdld/src/plugins/location/Makefile.am
+++ b/fsotdld/src/plugins/location/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gee-1.0 \
--pkg dbus-glib-1 \
diff --git a/fsotdld/src/plugins/provider_gps/Makefile.am
b/fsotdld/src/plugins/provider_gps/Makefile.am
index 093ed72..75a399f 100644
--- a/fsotdld/src/plugins/provider_gps/Makefile.am
+++ b/fsotdld/src/plugins/provider_gps/Makefile.am
@@ -22,6 +22,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsotdld/src/plugins/provider_gps_nmea/Makefile.am
b/fsotdld/src/plugins/provider_gps_nmea/Makefile.am
index 4f6136a..d7068eb 100644
--- a/fsotdld/src/plugins/provider_gps_nmea/Makefile.am
+++ b/fsotdld/src/plugins/provider_gps_nmea/Makefile.am
@@ -22,6 +22,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsotdld/src/plugins/provider_location_freegeoip/Makefile.am
b/fsotdld/src/plugins/provider_location_freegeoip/Makefile.am
index fff92a7..a5510be 100644
--- a/fsotdld/src/plugins/provider_location_freegeoip/Makefile.am
+++ b/fsotdld/src/plugins/provider_location_freegeoip/Makefile.am
@@ -22,6 +22,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsotdld/src/plugins/source_dummy/Makefile.am
b/fsotdld/src/plugins/source_dummy/Makefile.am
index e0da7e8..a9c4fae 100644
--- a/fsotdld/src/plugins/source_dummy/Makefile.am
+++ b/fsotdld/src/plugins/source_dummy/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsotdld/src/plugins/source_gps/Makefile.am
b/fsotdld/src/plugins/source_gps/Makefile.am
index 39988b7..715775b 100644
--- a/fsotdld/src/plugins/source_gps/Makefile.am
+++ b/fsotdld/src/plugins/source_gps/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsotdld/src/plugins/source_gsm/Makefile.am
b/fsotdld/src/plugins/source_gsm/Makefile.am
index 881eb28..915cae6 100644
--- a/fsotdld/src/plugins/source_gsm/Makefile.am
+++ b/fsotdld/src/plugins/source_gsm/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsotdld/src/plugins/source_ntp/Makefile.am
b/fsotdld/src/plugins/source_ntp/Makefile.am
index a6283c9..f444792 100644
--- a/fsotdld/src/plugins/source_ntp/Makefile.am
+++ b/fsotdld/src/plugins/source_ntp/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsotdld/src/plugins/sync_time/Makefile.am
b/fsotdld/src/plugins/sync_time/Makefile.am
index 1c5d7c8..d4da299 100644
--- a/fsotdld/src/plugins/sync_time/Makefile.am
+++ b/fsotdld/src/plugins/sync_time/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ../../lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gee-1.0 \
--pkg dbus-glib-1 \
diff --git a/fsotdld/tests/Makefile.am b/fsotdld/tests/Makefile.am
index db152b3..d12d89c 100644
--- a/fsotdld/tests/Makefile.am
+++ b/fsotdld/tests/Makefile.am
@@ -23,6 +23,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gio-2.0 \
diff --git a/fsousaged/src/bin/Makefile.am b/fsousaged/src/bin/Makefile.am
index 1b4806b..4b6e60d 100644
--- a/fsousaged/src/bin/Makefile.am
+++ b/fsousaged/src/bin/Makefile.am
@@ -22,6 +22,7 @@ fsousaged_SOURCES = \
$(BUILT_SOURCES): $(fsousaged_VALASOURCES)
$(VALAC) -C --vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg config \
--pkg gio-2.0 \
diff --git a/fsousaged/src/lib/Makefile.am b/fsousaged/src/lib/Makefile.am
index fd96b50..83ea190 100644
--- a/fsousaged/src/lib/Makefile.am
+++ b/fsousaged/src/lib/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg dbus-glib-1 \
diff --git a/fsousaged/src/plugins/dbus_service/Makefile.am
b/fsousaged/src/plugins/dbus_service/Makefile.am
index 893cc63..015a1da 100644
--- a/fsousaged/src/plugins/dbus_service/Makefile.am
+++ b/fsousaged/src/plugins/dbus_service/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/src/lib \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/vapi \
--pkg config \
--pkg glib-2.0 \
diff --git a/fsousaged/src/plugins/lowlevel_android/Makefile.am
b/fsousaged/src/plugins/lowlevel_android/Makefile.am
index a44b7ad..8034c1c 100644
--- a/fsousaged/src/plugins/lowlevel_android/Makefile.am
+++ b/fsousaged/src/plugins/lowlevel_android/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ./ \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/src/lib \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsousaged/src/plugins/lowlevel_kernel26/Makefile.am
b/fsousaged/src/plugins/lowlevel_kernel26/Makefile.am
index fbe774e..7b2262f 100644
--- a/fsousaged/src/plugins/lowlevel_kernel26/Makefile.am
+++ b/fsousaged/src/plugins/lowlevel_kernel26/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ./ \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/src/lib \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsousaged/src/plugins/lowlevel_kernel26_staysalive/Makefile.am
b/fsousaged/src/plugins/lowlevel_kernel26_staysalive/Makefile.am
index 7b2fc67..8fadd84 100644
--- a/fsousaged/src/plugins/lowlevel_kernel26_staysalive/Makefile.am
+++ b/fsousaged/src/plugins/lowlevel_kernel26_staysalive/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ./ \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/src/lib \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsousaged/src/plugins/lowlevel_openmoko/Makefile.am
b/fsousaged/src/plugins/lowlevel_openmoko/Makefile.am
index 499220d..fb863bf 100644
--- a/fsousaged/src/plugins/lowlevel_openmoko/Makefile.am
+++ b/fsousaged/src/plugins/lowlevel_openmoko/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ./ \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/src/lib \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsousaged/src/plugins/lowlevel_palmpre/Makefile.am
b/fsousaged/src/plugins/lowlevel_palmpre/Makefile.am
index 9753812..2699378 100644
--- a/fsousaged/src/plugins/lowlevel_palmpre/Makefile.am
+++ b/fsousaged/src/plugins/lowlevel_palmpre/Makefile.am
@@ -21,6 +21,7 @@ progs_ldadd = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir ./ \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/src/lib \
--pkg glib-2.0 \
--pkg gee-1.0 \
diff --git a/fsousaged/tests/Makefile.am b/fsousaged/tests/Makefile.am
index b21fc06..b4d4356 100644
--- a/fsousaged/tests/Makefile.am
+++ b/fsousaged/tests/Makefile.am
@@ -18,6 +18,7 @@ EXTRA_DIST += $(NULL)
# testsmartkeyfile_SOURCES = testsmartkeyfile.c
# $(testsmartkeyfile_SOURCES): $(testsmartkeyfile_VALASOURCES)
# $(VALAC) -C --basedir $(top_srcdir) --vapidir
$(top_srcdir)/fsoframework --pkg glib-2.0 --pkg gio-2.0 --pkg fsoframework-2.0
$^
+ --vapidir $(datadir)/vala/vapi \
# touch $@
# testsmartkeyfile_LDADD = $(progs_ldadd)
# EXTRA_DIST += $(testsmartkeyfile_VALASOURCES)
diff --git a/libfsobasics/tests/Makefile.am b/libfsobasics/tests/Makefile.am
index 4d62936..f5b24ed 100644
--- a/libfsobasics/tests/Makefile.am
+++ b/libfsobasics/tests/Makefile.am
@@ -21,6 +21,7 @@ VALAC_ARGS = \
--thread \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsobasics \
+ --vapidir $(datadir)/vala/vapi \
--vapidir $(top_srcdir)/vapi \
--pkg posix \
--pkg linux \
diff --git a/libfsoframework/fsoframework/Makefile.am
b/libfsoframework/fsoframework/Makefile.am
index ccc27aa..be8894c 100644
--- a/libfsoframework/fsoframework/Makefile.am
+++ b/libfsoframework/fsoframework/Makefile.am
@@ -12,6 +12,7 @@ AM_CFLAGS = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gmodule-2.0 \
--pkg gio-2.0 \
diff --git a/libfsoframework/tests/Makefile.am
b/libfsoframework/tests/Makefile.am
index 34f7727..7fbef84 100644
--- a/libfsoframework/tests/Makefile.am
+++ b/libfsoframework/tests/Makefile.am
@@ -25,6 +25,7 @@ VALAC_ARGS = \
-C \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoframework \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gio-2.0 \
diff --git a/libfsoresource/fsoresource/Makefile.am
b/libfsoresource/fsoresource/Makefile.am
index 80d5659..6b0ebdb 100644
--- a/libfsoresource/fsoresource/Makefile.am
+++ b/libfsoresource/fsoresource/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg glib-2.0 \
--pkg gio-2.0 \
--pkg fsobasics-2.0 \
diff --git a/libfsoresource/tests/Makefile.am b/libfsoresource/tests/Makefile.am
index 0a53c67..32e9ad6 100644
--- a/libfsoresource/tests/Makefile.am
+++ b/libfsoresource/tests/Makefile.am
@@ -17,6 +17,7 @@ VALAC_ARGS = \
-C \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsoresource \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gio-2.0 \
diff --git a/libfsotransport/fsotransport/Makefile.am
b/libfsotransport/fsotransport/Makefile.am
index df78ab1..7c36356 100644
--- a/libfsotransport/fsotransport/Makefile.am
+++ b/libfsotransport/fsotransport/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
VALAC_ARGS = \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg linux \
--pkg glib-2.0 \
diff --git a/libfsotransport/tests/Makefile.am
b/libfsotransport/tests/Makefile.am
index feccd08..b0e4270 100644
--- a/libfsotransport/tests/Makefile.am
+++ b/libfsotransport/tests/Makefile.am
@@ -16,6 +16,7 @@ VALAC_ARGS = \
-C \
--basedir $(top_srcdir) \
--vapidir $(top_srcdir)/fsotransport \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg glib-2.0 \
--pkg gio-2.0 \
diff --git a/libgsm0710mux/Makefile.am b/libgsm0710mux/Makefile.am
index 718191b..78e0c06 100644
--- a/libgsm0710mux/Makefile.am
+++ b/libgsm0710mux/Makefile.am
@@ -4,6 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
VALAC_ARGS = \
--vapidir ./vapi \
+ --vapidir $(datadir)/vala/vapi \
--header gsm0710mux.h \
--pkg config \
--pkg gsm0710-1.0 \
diff --git a/tools/fso-abyss/Makefile.am b/tools/fso-abyss/Makefile.am
index 453b733..25dee6c 100644
--- a/tools/fso-abyss/Makefile.am
+++ b/tools/fso-abyss/Makefile.am
@@ -4,6 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
VALAC_ARGS = \
--vapidir vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg gsm0710mux-1.0 \
--pkg fsobasics-2.0 \
diff --git a/tools/fso-alsa/src/Makefile.am b/tools/fso-alsa/src/Makefile.am
index 9edf7f4..7c2d08b 100644
--- a/tools/fso-alsa/src/Makefile.am
+++ b/tools/fso-alsa/src/Makefile.am
@@ -4,6 +4,7 @@ NULL =
VALAC_ARGS = \
-C --vapidir vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg fsodevice-2.0 \
--pkg fsoframework-2.0 \
--save-temps \
diff --git a/tools/mkdump/Makefile.am b/tools/mkdump/Makefile.am
index e73dd58..a0f7ab9 100644
--- a/tools/mkdump/Makefile.am
+++ b/tools/mkdump/Makefile.am
@@ -3,6 +3,7 @@ NULL =
AUTOMAKE_OPTIONS = subdir-objects
VALAC_ARGS = \
--vapidir vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg linux \
--pkg gio-2.0 \
diff --git a/tools/mterm2/Makefile.am b/tools/mterm2/Makefile.am
index 0fd1150..b14eb18 100644
--- a/tools/mterm2/Makefile.am
+++ b/tools/mterm2/Makefile.am
@@ -3,6 +3,7 @@ NULL =
AUTOMAKE_OPTIONS = subdir-objects
VALAC_ARGS = \
--vapidir vapi \
+ --vapidir $(datadir)/vala/vapi \
--pkg posix \
--pkg gio-2.0 \
--pkg dbus-glib-1 \
--
1.7.0.4
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
