[vala] Makefile.vapigen: use *_FILES instead of *_GIR
- From: Evan Nemerson <evann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] Makefile.vapigen: use *_FILES instead of *_GIR
- Date: Sat, 21 Jan 2012 11:27:11 +0000 (UTC)
commit 980273a8c4885ff4755252922f07641a3e8f3202
Author: Evan Nemerson <evan coeus-group com>
Date: Sat Jan 21 03:25:25 2012 -0800
Makefile.vapigen: use *_FILES instead of *_GIR
The more generic variable name is more appropriate since there may be
one or more custom vala file in addition to the GIR.
vapigen/Makefile.vapigen | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/vapigen/Makefile.vapigen b/vapigen/Makefile.vapigen
index f3cf30d..c268960 100644
--- a/vapigen/Makefile.vapigen
+++ b/vapigen/Makefile.vapigen
@@ -32,9 +32,9 @@
#
# Additional location(s) to search for GIR dependencies.
#
-# *_GIR
+# *_FILES
#
-# The GIR which should be used to generate the VAPI.
+# The files which should be used to generate the VAPI.
_vapigen_silent_prefix = $(_vapigen_silent_prefix_$(V))
_vapigen_silent_prefix_ = $(_vapigen_silent_prefix_$(AM_DEFAULT_VERBOSITY))
@@ -54,7 +54,7 @@ $(1): $$($(_vapi_name)_GIR)
$(foreach _vapi_metadatadir_name,$(if $($(_vapi_name)_METADATADIRS),$($(_vapi_name)_METADATADIRS),$(VAPIGEN_METADATADIRS)),--metadatadir $(_vapi_metadatadir_name)) \
$(foreach _vapi_dir_name,$(if $($(_vapi_name)_VAPIDIRS),$($(_vapi_name)_DIRS),$(VAPIGEN_VAPIDIRS)),--vapidir $(_vapi_dir_name)) \
$(foreach _vapi_dep_name,$(if $($(_vapi_name)_DEPS),$($(_vapi_name)_DEPS),$(VAPIGEN_DEPS)),--pkg $(_vapi_dep_name)) \
- $$($(_vapi_name)_GIR)
+ $$($(_vapi_name)_FILES)
endef
$(foreach vapi,$(VAPIGEN_VAPIS),$(eval $(call vapigen,$(vapi))))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]