colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-glib: specify --girdir to vapigen (bgo #678743)

Browse Source
This commit is contained in:
Craig Keogh
2012-06-25 22:36:28 +09:30
committed by Dan Williams
parent ec821e0783
commit c113ee03a5
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vapi/Makefile.am
View File

@@ -17,6 +17,7 @@ libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir
libnm_glib_vapi_METADATADIRS = $(srcdir) libnm_glib_vapi_METADATADIRS = $(srcdir)
libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir
libnm_glib_vapi_VAPIDIRS = $(srcdir) libnm_glib_vapi_VAPIDIRS = $(srcdir)
libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util
VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi

1
vapi/Makefile.vapigen
View File

@@ -53,6 +53,7 @@ $(1): $$($(_vapi_name)_GIR)
--library $(1:.vapi=) \ --library $(1:.vapi=) \
$(foreach _vapi_metadatadir_name,$(if $($(_vapi_name)_METADATADIRS),$($(_vapi_name)_METADATADIRS),$(VAPIGEN_METADATADIRS)),--metadatadir $(_vapi_metadatadir_name)) \ $(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)_VAPIDIRS),$(VAPIGEN_VAPIDIRS)),--vapidir $(_vapi_dir_name)) \ $(foreach _vapi_dir_name,$(if $($(_vapi_name)_VAPIDIRS),$($(_vapi_name)_VAPIDIRS),$(VAPIGEN_VAPIDIRS)),--vapidir $(_vapi_dir_name)) \
$(foreach _vapi_gir_dir,$(if $($(_vapi_name)_GIRDIRS),$($(_vapi_name)_GIRDIRS),$(VAPIGEN_GIRDIRS)),--girdir $(_vapi_gir_dir)) \
$(foreach _vapi_dep_name,$(if $($(_vapi_name)_DEPS),$($(_vapi_name)_DEPS),$(VAPIGEN_DEPS)),--pkg $(_vapi_dep_name)) \ $(foreach _vapi_dep_name,$(if $($(_vapi_name)_DEPS),$($(_vapi_name)_DEPS),$(VAPIGEN_DEPS)),--pkg $(_vapi_dep_name)) \
$$($(_vapi_name)_FILES) $$($(_vapi_name)_FILES)
endef endef