From 28028b26b3371756811e95d894f709f4b1207c00 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Dec 2019 18:29:24 +0100 Subject: New upstream version 1.22.0 --- src/initrd/meson.build | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/initrd/meson.build') diff --git a/src/initrd/meson.build b/src/initrd/meson.build index fa8c016b..09036f27 100644 --- a/src/initrd/meson.build +++ b/src/initrd/meson.build @@ -1,26 +1,29 @@ sources = files( 'nmi-cmdline-reader.c', + 'nmi-dt-reader.c', 'nmi-ibft-reader.c', ) -nm_cflags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON'] - libnmi_core = static_library( 'nmi-core', - c_args: nm_cflags, sources: sources, - include_directories: src_inc, - dependencies: libnm_core_dep, + dependencies: daemon_nm_default_dep, + c_args: daemon_c_flags, ) name = 'nm-initrd-generator' + +links = [ + libnetwork_manager_base, + libnmi_core, +] + executable( name, name + '.c', - c_args: nm_cflags, - include_directories: src_inc, - dependencies: [ libnm_core_dep ], - link_with: [libnetwork_manager_base, libnmi_core], + dependencies: daemon_nm_default_dep, + c_args: daemon_c_flags, + link_with: links, link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, -- cgit 1.3.0-6-gf8a5