diff options
| author | Craig Keogh <cskeogh@adam.com.au> | 2012-06-25 22:36:28 +0930 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2012-07-02 11:45:21 -0500 |
| commit | c113ee03a5cbdfdc1e6c1bf8de3eb8c4c59cb395 (patch) | |
| tree | 45fc6f1a40d24ad2f00fab26a44c471fd08c602d | |
| parent | ec821e0783150d9c02ab75ee4917b9b7d69f3220 (diff) | |
| download | NetworkManager-c113ee03a5cbdfdc1e6c1bf8de3eb8c4c59cb395.tar.gz | |
libnm-glib: specify --girdir to vapigen (bgo #678743)
| -rw-r--r-- | vapi/Makefile.am | 1 | ||||
| -rw-r--r-- | vapi/Makefile.vapigen | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 67a318094c..faa9eac71c 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -17,6 +17,7 @@ libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir libnm_glib_vapi_METADATADIRS = $(srcdir) libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir libnm_glib_vapi_VAPIDIRS = $(srcdir) +libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi diff --git a/vapi/Makefile.vapigen b/vapi/Makefile.vapigen index 30e515bfb9..feb5633428 100644 --- a/vapi/Makefile.vapigen +++ b/vapi/Makefile.vapigen @@ -53,6 +53,7 @@ $(1): $$($(_vapi_name)_GIR) --library $(1:.vapi=) \ $(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_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)) \ $$($(_vapi_name)_FILES) endef |