[libsoup/wip/new-master] build: Fix gtkdoc-scan linking against libsoup



commit 8e8fc80e6770c10d70887bac0e42cb8f818529f3
Author: Patrick Griffis <pgriffis igalia com>
Date:   Sat Sep 19 14:49:17 2020 -0700

    build: Fix gtkdoc-scan linking against libsoup
    
    This isn't an ideal fix and a static lib should work but this
    functions for now.

 docs/reference/meson.build |  2 +-
 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,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]