diff options
author | Aleksander Morgado <aleksander@aleksander.es> | 2021-09-15 12:46:28 +0200 |
---|---|---|
committer | Aleksander Morgado <aleksander@aleksander.es> | 2021-09-15 21:59:38 +0200 |
commit | 101ed5671145e195010b6ae1dc2ae4a697b57975 (patch) | |
tree | c3c715d93b5254f6699ecaa7aff2cfc5b95c561b | |
parent | 8167bc89e9fa3c78d25477adc0b2dc19875e7cef (diff) | |
download | ModemManager-101ed5671145e195010b6ae1dc2ae4a697b57975.tar.gz |
meson,build: don't include daemon enum sources in plugins
We will end up exporting what we shouldn't:
$ abidiff /tmp/autotools/lib/ModemManager/libmm-shared-icera.so /tmp/meson/lib/ModemManager/libmm-shared-icera.so
Functions changes summary: 0 Removed, 0 Changed (3 filtered out), 8 Added functions
Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
8 Added functions:
[A] 'function const gchar* mm_bearer_connection_status_get_string(MMBearerConnectionStatus)' {mm_bearer_connection_status_get_string}
[A] 'function GType mm_bearer_connection_status_get_type()' {mm_bearer_connection_status_get_type}
[A] 'function const gchar* mm_bearer_status_get_string(MMBearerStatus)' {mm_bearer_status_get_string}
[A] 'function GType mm_bearer_status_get_type()' {mm_bearer_status_get_type}
[A] 'function gchar* mm_filter_rule_build_string_from_mask(MMFilterRule)' {mm_filter_rule_build_string_from_mask}
[A] 'function GType mm_filter_rule_get_type()' {mm_filter_rule_get_type}
[A] 'function gchar* mm_port_probe_flag_build_string_from_mask(MMPortProbeFlag)' {mm_port_probe_flag_build_string_from_mask}
[A] 'function GType mm_port_probe_flag_get_type()' {mm_port_probe_flag_get_type}
-rw-r--r-- | plugins/meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/meson.build b/plugins/meson.build index 1202b7b68..c6ea7002e 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -83,7 +83,7 @@ if plugins_shared['icera'] plugins += {'shared-icera': { 'plugin': false, 'helper': {'sources': files('icera/mm-modem-helpers-icera.c'), 'include_directories': plugins_incs, 'c_args': common_c_args}, - 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args}, + 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args}, 'test': {'sources': files('icera/tests/test-modem-helpers-icera.c'), 'include_directories': plugins_incs + [icera_inc], 'dependencies': libhelpers_dep}, }} endif @@ -280,7 +280,7 @@ if plugins_options['cinterion'] plugins += {'plugin-cinterion': { 'plugin': true, 'helper': {'sources': files('cinterion/mm-modem-helpers-cinterion.c'), 'include_directories': plugins_incs, 'c_args': common_c_args}, - 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args}, + 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args}, 'test': {'sources': files('cinterion/tests/test-modem-helpers-cinterion.c'), 'include_directories': plugins_incs + [include_directories('cinterion')], 'dependencies': libport_dep}, }} @@ -456,7 +456,7 @@ if plugins_options['huawei'] plugins += {'plugin-huawei': { 'plugin': true, 'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c'), 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']}, - 'module': {'sources': sources + enums_sources + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']}, + 'module': {'sources': sources + enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']}, 'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep}, }} @@ -529,7 +529,7 @@ if plugins_options['mbm'] plugins += {'plugin-ericsson-mbm': { 'plugin': true, 'helper': {'sources': files('mbm/mm-modem-helpers-mbm.c'), 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']}, - 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']}, + 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']}, 'test': {'sources': files('mbm/tests/test-modem-helpers-mbm.c'), 'include_directories': plugins_incs + [include_directories('mbm')], 'dependencies': libhelpers_dep}, }} @@ -639,7 +639,7 @@ if plugins_options['option-hso'] plugins += {'plugin-option-hso': { 'plugin': true, - 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': '-DMM_MODULE_NAME="option-hso"'}, + 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': '-DMM_MODULE_NAME="option-hso"'}, }} endif |