From 0896d630769ae8f44f13d8e7784165601a140e80 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 14 Apr 2020 13:27:26 +0100 Subject: build: Do not use source/build_root functions Meson has the include_directories() object to specify inclusion paths that refer to both the source and build directories. --- docs/meson.build | 3 +-- meson.build | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index a99448af..e5b7ba7d 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -72,8 +72,7 @@ docpath = join_paths(pango_datadir, 'gtk-doc', 'html') gnome.gtkdoc('pango', main_xml: 'pango-docs.sgml', src_dir: [ - join_paths(meson.source_root(), 'pango'), - join_paths(meson.build_root(), 'pango'), + pango_inc, ], dependencies: docdeps, gobject_typesfile: configure_file(input: 'pango.types.in', diff --git a/meson.build b/meson.build index d4cff2af..dc634c8a 100644 --- a/meson.build +++ b/meson.build @@ -539,6 +539,7 @@ pkgconfig = import('pkgconfig') configure_file(output: 'config.h', configuration: pango_conf) root_inc = include_directories('.') +pango_inc = include_directories('pango') subdir('pango') subdir('utils') -- cgit v1.2.1