mirror of
https://git.proxmox.com/git/fwupd
synced 2025-08-09 07:59:19 +00:00
trivial: Make the build simpler by not using libfwupdbuiltin
Just compile the plugin libs into libfwupdengine.
This commit is contained in:
parent
19c6b7b036
commit
ae70c210c5
@ -34,7 +34,7 @@ if polkit.found()
|
|||||||
client_src += 'fu-polkit-agent.c'
|
client_src += 'fu-polkit-agent.c'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
daemon_src = [
|
fwupd_engine_src = [
|
||||||
'fu-cabinet-common.c',
|
'fu-cabinet-common.c',
|
||||||
'fu-config.c',
|
'fu-config.c',
|
||||||
'fu-debug.c',
|
'fu-debug.c',
|
||||||
@ -53,13 +53,13 @@ daemon_src = [
|
|||||||
] + systemd_src
|
] + systemd_src
|
||||||
|
|
||||||
if gudev.found()
|
if gudev.found()
|
||||||
daemon_src += 'fu-udev-backend.c'
|
fwupd_engine_src += 'fu-udev-backend.c'
|
||||||
endif
|
endif
|
||||||
if gusb.found()
|
if gusb.found()
|
||||||
daemon_src += 'fu-usb-backend.c'
|
fwupd_engine_src += 'fu-usb-backend.c'
|
||||||
endif
|
endif
|
||||||
if bluez.allowed()
|
if bluez.allowed()
|
||||||
daemon_src += 'fu-bluez-backend.c'
|
fwupd_engine_src += 'fu-bluez-backend.c'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# include event message file
|
# include event message file
|
||||||
@ -73,7 +73,7 @@ if host_machine.system() == 'windows'
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
windows = import('windows')
|
windows = import('windows')
|
||||||
daemon_src += windows.compile_resources(fwupd_rc)
|
fwupd_engine_src += windows.compile_resources(fwupd_rc)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
fwupdutil = library(
|
fwupdutil = library(
|
||||||
@ -194,15 +194,16 @@ plugins_hdr = custom_target('fwupd-generate-plugins-header',
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
# build all the plugins into one installed library
|
# build all the plugins and engine into one installed library
|
||||||
fwupdpluginbuiltin = library(
|
fwupdengine = library(
|
||||||
'fwupdpluginbuiltin',
|
'fwupdengine',
|
||||||
sources: [],
|
resources_src,
|
||||||
|
sources: fwupd_engine_src,
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: libdir_pkg,
|
install_dir: libdir_pkg,
|
||||||
include_directories: plugin_incdirs,
|
include_directories: plugin_incdirs,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
plugin_deps,
|
daemon_dep,
|
||||||
],
|
],
|
||||||
link_whole: [
|
link_whole: [
|
||||||
plugin_builtins,
|
plugin_builtins,
|
||||||
@ -213,24 +214,6 @@ fwupdpluginbuiltin = library(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
fwupdengine = library(
|
|
||||||
'fwupdengine',
|
|
||||||
resources_src,
|
|
||||||
sources: daemon_src,
|
|
||||||
install: true,
|
|
||||||
install_dir: libdir_pkg,
|
|
||||||
install_rpath: libdir_pkg,
|
|
||||||
include_directories: plugin_incdirs,
|
|
||||||
dependencies: [
|
|
||||||
daemon_dep,
|
|
||||||
],
|
|
||||||
link_with: [
|
|
||||||
fwupd,
|
|
||||||
fwupdplugin,
|
|
||||||
fwupdpluginbuiltin,
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
fwupdtool = executable(
|
fwupdtool = executable(
|
||||||
'fwupdtool',
|
'fwupdtool',
|
||||||
resources_src,
|
resources_src,
|
||||||
@ -253,11 +236,9 @@ fwupdtool = executable(
|
|||||||
valgrind,
|
valgrind,
|
||||||
],
|
],
|
||||||
link_with: [
|
link_with: [
|
||||||
fwupd,
|
|
||||||
fwupdengine,
|
fwupdengine,
|
||||||
fwupdplugin,
|
|
||||||
fwupdpluginbuiltin,
|
|
||||||
fwupdutil,
|
fwupdutil,
|
||||||
|
plugin_libs,
|
||||||
],
|
],
|
||||||
install: true,
|
install: true,
|
||||||
install_rpath: libdir_pkg,
|
install_rpath: libdir_pkg,
|
||||||
@ -321,10 +302,8 @@ executable(
|
|||||||
daemon_dep,
|
daemon_dep,
|
||||||
],
|
],
|
||||||
link_with: [
|
link_with: [
|
||||||
fwupd,
|
|
||||||
fwupdengine,
|
fwupdengine,
|
||||||
fwupdplugin,
|
plugin_libs,
|
||||||
fwupdpluginbuiltin,
|
|
||||||
],
|
],
|
||||||
c_args: [
|
c_args: [
|
||||||
'-DFU_OFFLINE_DESTDIR=""',
|
'-DFU_OFFLINE_DESTDIR=""',
|
||||||
@ -363,11 +342,9 @@ if get_option('tests')
|
|||||||
daemon_dep,
|
daemon_dep,
|
||||||
],
|
],
|
||||||
link_with: [
|
link_with: [
|
||||||
fwupd,
|
|
||||||
fwupdengine,
|
fwupdengine,
|
||||||
fwupdplugin,
|
|
||||||
fwupdpluginbuiltin,
|
|
||||||
fwupdutil,
|
fwupdutil,
|
||||||
|
plugin_libs,
|
||||||
],
|
],
|
||||||
c_args: [
|
c_args: [
|
||||||
],
|
],
|
||||||
|
Loading…
Reference in New Issue
Block a user