endif
libxkbcommon = library(
'xkbcommon',
- 'xkbcommon/xkbcommon.h',
+ 'include/xkbcommon/xkbcommon.h',
libxkbcommon_sources,
link_args: libxkbcommon_link_args,
link_depends: libxkbcommon_link_deps,
gnu_symbol_visibility: 'hidden',
version: '0.0.0',
install: true,
- include_directories: include_directories('src'),
+ include_directories: include_directories('src', 'include'),
)
install_headers(
- 'xkbcommon/xkbcommon.h',
- 'xkbcommon/xkbcommon-compat.h',
- 'xkbcommon/xkbcommon-compose.h',
- 'xkbcommon/xkbcommon-keysyms.h',
- 'xkbcommon/xkbcommon-names.h',
+ 'include/xkbcommon/xkbcommon.h',
+ 'include/xkbcommon/xkbcommon-compat.h',
+ 'include/xkbcommon/xkbcommon-compose.h',
+ 'include/xkbcommon/xkbcommon-keysyms.h',
+ 'include/xkbcommon/xkbcommon-names.h',
subdir: 'xkbcommon',
)
dep_libxkbcommon = declare_dependency(
link_with: libxkbcommon,
- include_directories: include_directories('.'),
+ include_directories: include_directories('include'),
)
pkgconfig.generate(
libxkbcommon,
endif
libxkbcommon_x11 = library(
'xkbcommon-x11',
- 'xkbcommon/xkbcommon-x11.h',
+ 'include/xkbcommon/xkbcommon-x11.h',
libxkbcommon_x11_sources,
link_args: libxkbcommon_x11_link_args,
link_depends: libxkbcommon_x11_link_deps,
gnu_symbol_visibility: 'hidden',
version: '0.0.0',
install: true,
- include_directories: include_directories('src'),
+ include_directories: include_directories('src', 'include'),
link_with: libxkbcommon,
dependencies: [
xcb_dep,
],
)
install_headers(
- 'xkbcommon/xkbcommon-x11.h',
+ 'include/xkbcommon/xkbcommon-x11.h',
subdir: 'xkbcommon',
)
dep_libxkbcommon_x11 = declare_dependency(
link_with: libxkbcommon_x11,
- include_directories: include_directories('.'),
+ include_directories: include_directories('include'),
)
pkgconfig.generate(
libxkbcommon_x11,
endif
libxkbregistry = library(
'xkbregistry',
- 'xkbcommon/xkbregistry.h',
+ 'include/xkbcommon/xkbregistry.h',
libxkbregistry_sources,
link_args: libxkbregistry_link_args,
link_depends: libxkbregistry_link_deps,
dependencies: deps_libxkbregistry,
version: '0.0.0',
install: true,
- include_directories: include_directories('src'),
+ include_directories: include_directories('src', 'include'),
)
install_headers(
- 'xkbcommon/xkbregistry.h',
+ 'include/xkbcommon/xkbregistry.h',
subdir: 'xkbcommon',
)
pkgconfig.generate(
)
dep_libxkbregistry = declare_dependency(
- include_directories: include_directories('.'),
- link_with: libxkbregistry
- )
+ link_with: libxkbregistry,
+ include_directories: include_directories('include'),
+ )
endif
man_pages = []
dependencies: dep_libxkbcommon,
)
tools_dep = declare_dependency(
- include_directories: [include_directories('tools')],
+ include_directories: [include_directories('tools', 'include')],
link_with: libxkbcommon_tools_internal,
)
libxkbcommon_sources,
dependencies: [tools_dep],
c_args: ['-DENABLE_PRIVATE_APIS'],
- include_directories: [include_directories('src')],
+ include_directories: [include_directories('src', 'include')],
install: false)
configh_data.set10('HAVE_XKBCLI_COMPILE_KEYMAP', true)
executable('xkbcli-how-to-type',
'bench/bench.c',
'bench/bench.h',
libxkbcommon_sources,
- include_directories: include_directories('src'),
+ include_directories: include_directories('src', 'include'),
)
test_dep = declare_dependency(
- include_directories: include_directories('src'),
+ include_directories: include_directories('src', 'include'),
link_with: libxkbcommon_test_internal,
)
if get_option('enable-x11')
libxkbcommon_x11_internal = static_library(
'xkbcommon-x11-internal',
libxkbcommon_x11_sources,
- include_directories: include_directories('src'),
+ include_directories: include_directories('src', 'include'),
link_with: libxkbcommon_test_internal,
dependencies: [
xcb_dep,
'doc/user-configuration.md',
'doc/rules-format.md',
'doc/keymap-format-text-v1.md',
- 'xkbcommon/xkbcommon.h',
- 'xkbcommon/xkbcommon-names.h',
- 'xkbcommon/xkbcommon-x11.h',
- 'xkbcommon/xkbcommon-compose.h',
- 'xkbcommon/xkbregistry.h',
+ 'include/xkbcommon/xkbcommon.h',
+ 'include/xkbcommon/xkbcommon-names.h',
+ 'include/xkbcommon/xkbcommon-x11.h',
+ 'include/xkbcommon/xkbcommon-compose.h',
+ 'include/xkbcommon/xkbregistry.h',
]
doxygen_data = configuration_data()
doxygen_data.set('PACKAGE_NAME', meson.project_name())