From ee9c73a923909e23a649407be77e25235d769e25 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 11 May 2018 22:08:45 +0200 Subject: New upstream version 1.10.8 --- shared/meson.build | 70 ------------------------------------------------------ 1 file changed, 70 deletions(-) delete mode 100644 shared/meson.build (limited to 'shared/meson.build') diff --git a/shared/meson.build b/shared/meson.build deleted file mode 100644 index a812b588..00000000 --- a/shared/meson.build +++ /dev/null @@ -1,70 +0,0 @@ -shared_c_list_dep = declare_dependency( - include_directories: include_directories('c-list/src') -) - -shared_c_siphash = static_library( - 'c-siphash', - sources: ['c-siphash/src/c-siphash.c'] -) - -shared_c_siphash_dep = declare_dependency( - include_directories: include_directories('c-siphash/src'), - link_with: shared_c_siphash -) - -shared_n_acd = static_library( - 'n-acd', - sources: ['n-acd/src/n-acd.c'], - dependencies: [ shared_c_siphash_dep, shared_c_list_dep ] -) - -shared_n_acd_dep = declare_dependency( - include_directories: include_directories('.'), - link_with: shared_n_acd, -) - -shared_inc = include_directories('.') - -version_conf = configuration_data() -version_conf.set('NM_MAJOR_VERSION', nm_major_version) -version_conf.set('NM_MINOR_VERSION', nm_minor_version) -version_conf.set('NM_MICRO_VERSION', nm_micro_version) - -version = 'nm-version-macros.h' - -version_header = configure_file( - input: version + '.in', - output: version, - configuration: version_conf -) - -shared_meta_setting = files('nm-meta-setting.c') - -shared_test_utils = files('nm-test-utils-impl.c') - -shared_siphash = files('nm-utils/siphash24.c') - -shared_udev_utils = files('nm-utils/nm-udev-utils.c') - -shared_utils = files( - 'nm-utils/nm-enum-utils.c', - 'nm-utils/nm-hash-utils.c', - 'nm-utils/nm-random-utils.c', - 'nm-utils/nm-shared-utils.c' -) - -shared_vpn_plugin_utils = files('nm-utils/nm-vpn-plugin-utils.c') - -shared_sources = shared_utils + shared_meta_setting + shared_udev_utils + files( - 'nm-utils/c-list-util.c', - 'nm-utils/nm-dedup-multi.c' -) - -shared_dep = declare_dependency( - include_directories: [ - top_inc, - shared_inc, - include_directories('nm-utils') - ], - dependencies: glib_dep -) -- cgit 1.3.0-6-gf8a5 From 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 4 Jun 2018 00:07:45 +0200 Subject: New upstream version 1.11.4 --- shared/meson.build | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 shared/meson.build (limited to 'shared/meson.build') diff --git a/shared/meson.build b/shared/meson.build new file mode 100644 index 00000000..db6b8a40 --- /dev/null +++ b/shared/meson.build @@ -0,0 +1,78 @@ +shared_inc = include_directories('.') + +shared_c_siphash = static_library( + 'c-siphash', + sources: 'c-siphash/src/c-siphash.c', +) + +shared_c_siphash_dep = declare_dependency( + include_directories: shared_inc, + link_with: shared_c_siphash, +) + +shared_n_acd = static_library( + 'n-acd', + sources: 'n-acd/src/n-acd.c', + include_directories: [ + include_directories('c-siphash/src'), + include_directories('c-list/src'), + ], + dependencies: shared_c_siphash_dep, +) + +shared_n_acd_dep = declare_dependency( + include_directories: shared_inc, + link_with: shared_n_acd, +) + +version_conf = configuration_data() +version_conf.set('NM_MAJOR_VERSION', nm_major_version) +version_conf.set('NM_MINOR_VERSION', nm_minor_version) +version_conf.set('NM_MICRO_VERSION', nm_micro_version) + +version_header = configure_file( + input: 'nm-version-macros.h.in', + output: 'nm-version-macros.h', + configuration: version_conf, +) + +shared_nm_utils_nm_meta_setting_c = files('nm-meta-setting.c') + +shared_nm_test_utils_impl_c = files('nm-test-utils-impl.c') + +shared_nm_utils_nm_vpn_plugin_utils_c = files('nm-utils/nm-vpn-plugin-utils.c') + +shared_files_libnm_core = files(''' + c-siphash/src/c-siphash.c + nm-utils/c-list-util.c + nm-utils/nm-dedup-multi.c + nm-utils/nm-enum-utils.c + nm-utils/nm-hash-utils.c + nm-utils/nm-random-utils.c + nm-utils/nm-shared-utils.c + nm-utils/nm-udev-utils.c +'''.split()) + +shared_files_clients_common = files(''' + c-siphash/src/c-siphash.c + nm-utils/nm-enum-utils.c + nm-utils/nm-hash-utils.c + nm-utils/nm-random-utils.c + nm-utils/nm-shared-utils.c +'''.split()) + +shared_files_libnm_util = files(''' + nm-utils/nm-shared-utils.c +'''.split()) + +shared_files_libnm_glib = files(''' + nm-utils/nm-udev-utils.c +'''.split()) + +shared_dep = declare_dependency( + include_directories: [ + top_inc, + shared_inc, + ], + dependencies: glib_dep, +) -- cgit 1.3.0-6-gf8a5