Can now embed modules in the liblektor.so

meson.build

@@ -81,8 +81,8 @@ includes = include_directories('inc')
 
 # Server
 core_deps = [ dependency('sqlite3', version: '>= 3.31.0')
-            , dependency('libcurl')
-            , dependency('json-c')
+            , dependency('libcurl', required: true)
+            , dependency('json-c',  required: true)
             , dependency('threads', required: true)
             ]
 
@@ -91,12 +91,13 @@ manpath = custom_target( 'manpath'
                        , input: 'meson.build'
                        , command: [ find_program('sh'), '-c', 'echo \'const char *man_executable_path = "\'"$(which man)"\'";\' > @OUTPUT@' ] )
 common_deps = [ declare_dependency(
-    include_directories: includes
-  , link_with:
-    [ static_library( 'common'
+  link_with: [ static_library( 'common'
     , files(common_sources)
-                    , include_directories: includes )
-    , static_library( 'generated'
+    , manpath
+    , include_directories: includes ) ] ) ]
+
+lib = shared_library( 'lektor'
+                    , files(core_sources + mthread_sources)
                     , [ custom_target( 'sqlinit'
                                      , output: 'sqlinit.c'
                                      , input: 'src/database/disk.sql'
@@ -105,27 +106,17 @@ common_deps = [ declare_dependency(
                                      , output: 'sqlmemory.c'
                                      , input: 'src/database/memory.sql'
                                      , command: [ find_program('xxd'), '-i', '@INPUT@', '@OUTPUT@' ] ) ]
-                    , manpath )
-    ] ) ]
-
-mthread_deps = [ declare_dependency( link_with: static_library( 'mthread'
-                                                              , files(mthread_sources)
-                                                              , include_directories: includes )
-                                   , include_directories: includes
-                                   , dependencies: [ common_deps ] ) ]
-
-lib = static_library( 'lektor'
-                    , files(core_sources)
+                    , manpath
                     , include_directories: includes
-                    , dependencies: [ core_deps, libdl, common_deps, mthread_deps ] )
+                    , dependencies: [ core_deps, libdl, common_deps ] )
 
 bin_deps = [ declare_dependency( link_with: lib, include_directories: includes) ]
 
 # Client executable
 lkt = executable( 'lkt'
                 , files('src/main/lkt.c', 'src/cmd.c', 'src/common.c')
+                , manpath
                 , include_directories: includes
-                , dependencies: [ common_deps ]
                 , install: true )
 
 # X11 window module
@@ -134,12 +125,11 @@ if get_option('module_x11').enabled()
   lib_mod_x11 = both_libraries ( '_module_x11'
                                , files(['src/module/module_x11.c', 'src/module/mpv.c'])
                                , include_directories: includes
-                               , dependencies: [ dep_x11, dep_mpv ]
-                               , link_with: lib
+                               , dependencies: [ dep_x11, dep_mpv, bin_deps ]
                                , install: true
                                , install_dir: 'lib/lektor' )
   if get_option('static_modules').enabled()
-    lektor_modules += [ lib_mod_x11 ]
+    lektor_modules += [ lib_mod_x11.get_static_lib() ]
   endif
 endif
 
@@ -149,20 +139,19 @@ if get_option('module_sdl').enabled()
   lib_mod_sdl = both_libraries ( '_module_sdl2'
                                , files(['src/module/module_sdl2.c', 'src/module/mpv.c'])
                                , include_directories: includes
-                               , dependencies: [ dep_sdl, dep_mpv ]
-                               , link_with: lib
+                               , dependencies: [ dep_sdl, dep_mpv, bin_deps ]
                                , install: true
                                , install_dir: 'lib/lektor' )
   if get_option('static_modules').enabled()
-    lektor_modules += [ lib_mod_sdl ]
+    lektor_modules += [ lib_mod_sdl.get_static_lib() ]
   endif
 endif
 
+modules_dep = declare_dependency( link_with: lektor_modules )
 srv = executable( meson.project_name() + 'd'
                 , files('src/main/server.c')
                 , include_directories: includes
-                , link_with: lektor_modules
-                , dependencies: [ bin_deps ]
+                , dependencies: [ bin_deps, modules_dep ]
                 , install: true )
 
 # Man pages