diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2018-06-07 15:18:38 +0000 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2018-06-07 15:18:38 +0000 |
| commit | b04142a24f8afdafd9717f0a543cb3902452cf05 (patch) | |
| tree | 2df5973f7a09056927ec3c4554290e997c4785bc /gio/meson.build | |
| parent | a7e383b0545a77a506a620c28b5b5a1759694237 (diff) | |
| parent | 077e9f04c185cbc36b1141f5eca4877756d035bf (diff) | |
| download | glib-b04142a24f8afdafd9717f0a543cb3902452cf05.tar.gz | |
Merge branch 'fam' into 'master'
Meson: Build fam module
See merge request GNOME/glib!71
Diffstat (limited to 'gio/meson.build')
| -rw-r--r-- | gio/meson.build | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gio/meson.build b/gio/meson.build index 355510ef1..60b433ce8 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -753,11 +753,6 @@ if host_system == 'windows' internal_deps += [ giowin32_lib ] endif -# FIXME: FAM support -#if HAVE_FAM -# subdir('fam') -#endif - if have_bash install_data([ 'completion/gapplication', @@ -894,7 +889,7 @@ executable('gresource', 'gresource-tool.c', link_args : noseh_link_args, dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) -executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', +gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', install : true, c_args : gio_c_args, # intl.lib is not compatible with SAFESEH @@ -952,6 +947,8 @@ if enable_systemtap install : true) endif +subdir('fam') + if host_system != 'windows' subdir('tests') endif |