diff options
| author | Ran Benita <ran234@gmail.com> | 2019-02-08 12:18:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-08 12:18:00 +0200 |
| commit | 327fd9a1dee892dff5d3795ae960d1a8910f1d00 (patch) | |
| tree | f1fbe3162ba247373096759de45e9a4400d362b7 | |
| parent | 73794e1e547704d7ba9242a8f7873e17631faecb (diff) | |
| parent | 75ce741ab97e3d17a0c9b06dd4bdf57c00d5538e (diff) | |
| download | xorg-lib-libxkbcommon-327fd9a1dee892dff5d3795ae960d1a8910f1d00.tar.gz | |
Merge pull request #85 from whot/wip/static-lib-sources
meson.build: manually link all sources into the library
| -rw-r--r-- | meson.build | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 4e22025..e10dd13 100644 --- a/meson.build +++ b/meson.build @@ -122,8 +122,7 @@ yacc_gen = generator( output: ['@BASENAME@.c', '@BASENAME@.h'], arguments: ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@', '-p _xkbcommon_'], ) -libxkbcommon_internal = static_library( - 'xkbcommon-internal', +libxkbcommon_sources = [ 'src/compose/parser.c', 'src/compose/parser.h', 'src/compose/paths.c', @@ -177,8 +176,7 @@ libxkbcommon_internal = static_library( 'src/utf8.h', 'src/utils.c', 'src/utils.h', - include_directories: include_directories('src'), -) +] libxkbcommon_link_args = [] if have_version_script libxkbcommon_link_args += '-Wl,--version-script=' + join_paths(meson.source_root(), 'xkbcommon.map') @@ -186,11 +184,12 @@ endif libxkbcommon = library( 'xkbcommon', 'xkbcommon/xkbcommon.h', - link_whole: libxkbcommon_internal, + libxkbcommon_sources, link_args: libxkbcommon_link_args, link_depends: 'xkbcommon.map', version: '0.0.0', install: true, + include_directories: include_directories('src'), ) install_headers( 'xkbcommon/xkbcommon.h', @@ -281,8 +280,8 @@ libxkbcommon_test_internal = static_library( 'test/common.c', 'test/test.h', 'test/evdev-scancodes.h', + libxkbcommon_sources, include_directories: include_directories('src'), - link_with: libxkbcommon_internal, ) test_dep = declare_dependency( include_directories: include_directories('src'), |