Merge branch 'wip/add-built-headers-deps-v2' into 'main'

meson: Cleanup and fix include files paths, using base path without repetitions

See merge request GNOME/glib!3011
This commit is contained in:
Marco Trevisan
2022-10-25 09:14:15 +00:00
5 changed files with 22 additions and 18 deletions

View File

@@ -1,3 +1,5 @@
gobject_includedir = glib_includedir / 'gobject'
gobject_install_headers = files(
'gobject-autocleanups.h',
'glib-types.h',
@@ -29,12 +31,11 @@ gvisibility_h = custom_target(
output: 'gobject-visibility.h',
command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GOBJECT', '@OUTPUT@'],
install: true,
install_dir: glib_includedir / 'gobject',
install_tag : 'devel',
install_dir: gobject_includedir,
)
gobject_sources += gvisibility_h
install_headers(gobject_install_headers, subdir : 'glib-2.0/gobject')
install_headers(gobject_install_headers, install_dir : gobject_includedir)
gobject_sources += files(
'gatomicarray.c',