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
This commit is contained in:
Iñigo Martínez 2018-01-27 09:49:17 +01:00
parent 69eac7d7cc
commit ef5d07fa21

View File

@ -14,8 +14,6 @@ cdata = configuration_data()
cdata.set_quoted('GETTEXT_PACKAGE', get_option('package_name')) cdata.set_quoted('GETTEXT_PACKAGE', get_option('package_name'))
cdata.set_quoted('PACKAGE_VERSION', get_option('package_version')) cdata.set_quoted('PACKAGE_VERSION', get_option('package_version'))
libgvc_inc = include_directories('.')
libgvc_gir_headers = [ libgvc_gir_headers = [
'gvc-channel-map.h', 'gvc-channel-map.h',
'gvc-mixer-card.h', 'gvc-mixer-card.h',
@ -78,7 +76,6 @@ endif
if enable_static if enable_static
libgvc_static = static_library('gvc', libgvc_static = static_library('gvc',
sources: libgvc_gir_sources + libgvc_no_gir_sources, sources: libgvc_gir_sources + libgvc_no_gir_sources,
include_directories: libgvc_inc,
dependencies: libgvc_deps, dependencies: libgvc_deps,
c_args: c_args c_args: c_args
) )
@ -91,7 +88,6 @@ else
libgvc_shared = shared_library('gvc', libgvc_shared = shared_library('gvc',
sources: libgvc_gir_sources + libgvc_no_gir_sources, sources: libgvc_gir_sources + libgvc_no_gir_sources,
include_directories: libgvc_inc,
dependencies: libgvc_deps, dependencies: libgvc_deps,
c_args: c_args, c_args: c_args,
install_rpath: pkgdatadir, install_rpath: pkgdatadir,
@ -128,7 +124,7 @@ endif
libgvc_dep = declare_dependency( libgvc_dep = declare_dependency(
link_with: libgvc, link_with: libgvc,
include_directories: libgvc_inc, include_directories: include_directories('.'),
dependencies: libgvc_deps dependencies: libgvc_deps
) )