[seahorse] Makefile.am: Fix jhbuild of vala sources
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] Makefile.am: Fix jhbuild of vala sources
- Date: Wed, 5 Mar 2014 07:35:20 +0000 (UTC)
commit cb201224e737e87d9c6a8f77850be662d2985b77
Author: Stef Walter <stefw gnome org>
Date: Wed Mar 5 08:28:08 2014 +0100
Makefile.am: Fix jhbuild of vala sources
common/Makefile.am | 6 +++---
gkr/Makefile.am | 2 +-
pkcs11/Makefile.am | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index 416e5e8..1dcccde 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -35,10 +35,10 @@ libcommon_a_CFLAGS = \
-include config.h -w
if WITH_VALAC
-$(common_HEADER): $(common_VALA)
+$(common_HEADER): $(common_VALA) common/config.vapi
$(V_VALAC) $(VALAC) $(VALA_FLAGS) -C --use-header --header=$(common_HEADER) \
- --vapidir=$(srcdir)/common --pkg gtk+-3.0 --pkg gcr-3 --pkg config \
- --vapi=common.vapi --directory=common $^ && touch -c $(common_HEADER) $(common_C)
+ --vapidir=$(abs_srcdir)/common --pkg gtk+-3.0 --pkg gcr-3 \
+ --vapi=common.vapi --directory=$(builddir)/common --basedir=$(dir $<) $^
endif
$(common_C): $(common_HEADER)
diff --git a/gkr/Makefile.am b/gkr/Makefile.am
index 2fb355c..ba5a996 100644
--- a/gkr/Makefile.am
+++ b/gkr/Makefile.am
@@ -28,7 +28,7 @@ if WITH_VALAC
$(gkr_HEADER): $(gkr_VALA) $(common_VAPI)
$(V_VALAC) $(VALAC) $(VALA_FLAGS) -C --use-header --header=$(gkr_HEADER) \
--pkg gtk+-3.0 --pkg gcr-3 --pkg gcr-ui-3 --pkg libsecret-1 \
- --directory=gkr $^ && touch -c $(gkr_HEADER) $(gkr_C)
+ --directory=$(builddir)/gkr --basedir=$(dir $<) $^
endif
$(gkr_C): $(gkr_HEADER)
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index be66f23..27ced64 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -30,7 +30,7 @@ if WITH_VALAC
$(pkcs11_HEADER): $(pkcs11_VALA) $(common_VAPI)
$(V_VALAC) $(VALAC) $(VALA_FLAGS) -C --use-header --header=$(pkcs11_HEADER) \
--pkg gtk+-3.0 --pkg gcr-3 --pkg gcr-ui-3 --pkg pkcs11 \
- --directory=pkcs11 $^ && touch -c $(pkcs11_HEADER) $(pkcs11_C)
+ --directory=$(builddir)/pkcs11 --basedir=$(dir $<) $^
endif
$(pkcs11_C): $(pkcs11_HEADER)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]