diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2020-09-19 14:49:17 -0700 |
|---|---|---|
| committer | Patrick Griffis <pgriffis@igalia.com> | 2020-09-19 15:41:25 -0700 |
| commit | 52f1598fb183bb06afee70b94da6cb0a9888664c (patch) | |
| tree | f8a52d5df05690cc9e63da0e0ce77a5e5c98af9a | |
| parent | 0fe8c042fb7162bedd5c762a63eb77aaa4cd6d78 (diff) | |
| download | libsoup-52f1598fb183bb06afee70b94da6cb0a9888664c.tar.gz | |
build: Fix gtkdoc-scan linking against libsoup
This isn't an ideal fix and a static lib should work but this
functions for now.
| -rw-r--r-- | docs/reference/meson.build | 2 | ||||
| -rw-r--r-- | libsoup/meson.build | 22 |
2 files changed, 21 insertions, 3 deletions
diff --git a/docs/reference/meson.build b/docs/reference/meson.build index eb6ae393..3956b5ef 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -60,7 +60,7 @@ gnome.gtkdoc('libsoup-2.4', namespace : 'soup', mkdb_args : mkdb_args, scan_args : scan_args, - dependencies : libsoup_dep, + dependencies : libsoup_private_dep, install : true, content_files: [ 'build-howto.xml', diff --git a/libsoup/meson.build b/libsoup/meson.build index d353e927..e1784112 100644 --- a/libsoup/meson.build +++ b/libsoup/meson.build @@ -221,7 +221,20 @@ libsoup = library('soup-@0@'.format(apiversion), install : true, dependencies : deps) -libsoup_static = static_library('soup-static', +libsoup_private = library('soup-private-@0@'.format(apiversion), + sources : [ + soup_sources, + soup_private_enums, + soup_enums, + ], + version : libversion, + soversion : soversion, + darwin_versions: darwin_versions, + c_args : libsoup_c_args, + include_directories : libsoup_includes, + dependencies : deps) + +libsoup_static = static_library('soup-@0@-static'.format(apiversion), sources : [ soup_sources, soup_private_enums, @@ -229,7 +242,6 @@ libsoup_static = static_library('soup-static', ], c_args : libsoup_c_args, include_directories : libsoup_includes, - install : true, dependencies : deps, ) @@ -247,6 +259,12 @@ libsoup_dep = declare_dependency(link_with : libsoup, dependencies : [ platform_deps, glib_deps ] ) +libsoup_private_dep = declare_dependency(link_with : libsoup_private, + include_directories : libsoup_includes, + sources : soup_enum_h, + dependencies : [ platform_deps, glib_deps ] +) + libsoup_static_dep = declare_dependency(link_with : libsoup_static, include_directories : libsoup_includes, sources : soup_enum_h, |