From ef5d07fa21a56889d8ffe7d45818dab1e9299ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Sat, 27 Jan 2018 09:49:17 +0100 Subject: [PATCH] build: Remove the include directory variable The variable which holds the current directory is not necessary because this is already included when building the library. However, it might be interessant for any package using the library to include the directory where headers are present, so the current directory is appended to the library dependency without the include directory variable. https://bugzilla.gnome.org/show_bug.cgi?id=792948 --- meson.build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meson.build b/meson.build index e5f03c8..bde1783 100644 --- a/meson.build +++ b/meson.build @@ -14,8 +14,6 @@ cdata = configuration_data() cdata.set_quoted('GETTEXT_PACKAGE', get_option('package_name')) cdata.set_quoted('PACKAGE_VERSION', get_option('package_version')) -libgvc_inc = include_directories('.') - libgvc_gir_headers = [ 'gvc-channel-map.h', 'gvc-mixer-card.h', @@ -78,7 +76,6 @@ endif if enable_static libgvc_static = static_library('gvc', sources: libgvc_gir_sources + libgvc_no_gir_sources, - include_directories: libgvc_inc, dependencies: libgvc_deps, c_args: c_args ) @@ -91,7 +88,6 @@ else libgvc_shared = shared_library('gvc', sources: libgvc_gir_sources + libgvc_no_gir_sources, - include_directories: libgvc_inc, dependencies: libgvc_deps, c_args: c_args, install_rpath: pkgdatadir, @@ -128,7 +124,7 @@ endif libgvc_dep = declare_dependency( link_with: libgvc, - include_directories: libgvc_inc, + include_directories: include_directories('.'), dependencies: libgvc_deps )