You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
96 lines
5.4 KiB
96 lines
5.4 KiB
--- a/plugins/meson.build
|
|
+++ b/plugins/meson.build
|
|
@@ -88,7 +88,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, 'include_directories': plugins_incs, 'c_args': common_c_args},
|
|
+ 'module': {'sources': sources + daemon_enums_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
|
|
@@ -185,7 +185,7 @@ if plugins_shared['telit']
|
|
plugins += {'shared-telit': {
|
|
'plugin': false,
|
|
'helper': {'sources': files('telit/mm-modem-helpers-telit.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
|
|
- 'module': {'sources': sources, 'include_directories': plugins_incs + [telit_inc], 'c_args': common_c_args},
|
|
+ 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs + [telit_inc], 'c_args': common_c_args},
|
|
'test': {'sources': files('telit/tests/test-mm-modem-helpers-telit.c'), 'include_directories': telit_inc, 'dependencies': libmm_test_common_dep},
|
|
}}
|
|
endif
|
|
@@ -285,7 +285,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, 'include_directories': plugins_incs, 'c_args': common_c_args},
|
|
+ 'module': {'sources': sources + daemon_enums_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},
|
|
}}
|
|
|
|
@@ -460,8 +460,8 @@ 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 + port_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
|
|
+ 'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c') + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
|
|
+ 'module': {'sources': sources + enums_sources + port_enums_sources + daemon_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},
|
|
}}
|
|
|
|
@@ -534,7 +534,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, '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"']},
|
|
'test': {'sources': files('mbm/tests/test-modem-helpers-mbm.c'), 'include_directories': plugins_incs + [include_directories('mbm')], 'dependencies': libhelpers_dep},
|
|
}}
|
|
|
|
@@ -644,7 +644,7 @@ if plugins_options['option-hso']
|
|
|
|
plugins += {'plugin-option-hso': {
|
|
'plugin': true,
|
|
- 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': '-DMM_MODULE_NAME="option-hso"'},
|
|
+ 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': '-DMM_MODULE_NAME="option-hso"'},
|
|
}}
|
|
endif
|
|
|
|
@@ -852,7 +852,7 @@ if plugins_options['ublox']
|
|
plugins += {'plugin-ublox': {
|
|
'plugin': true,
|
|
'helper': {'sources': files('ublox/mm-modem-helpers-ublox.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
|
|
- 'module': {'sources': sources, 'include_directories': plugins_incs + [ublox_inc], 'c_args': common_c_args},
|
|
+ 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs + [ublox_inc], 'c_args': common_c_args},
|
|
'test': {'sources': files('ublox/tests/test-modem-helpers-ublox.c'), 'include_directories': ublox_inc, 'dependencies': libmm_test_common_dep},
|
|
}}
|
|
|
|
--- a/src/meson.build
|
|
+++ b/src/meson.build
|
|
@@ -225,14 +225,15 @@ sources = files(
|
|
|
|
enums_types = 'mm-daemon-enums-types'
|
|
|
|
-sources += gnome.mkenums(
|
|
+daemon_enums_sources = []
|
|
+daemon_enums_sources += gnome.mkenums(
|
|
enums_types + '.c',
|
|
sources: headers,
|
|
c_template: build_aux_dir / enums_types + '.c.template',
|
|
fhead: '#include "mm-daemon-enums-types.h"',
|
|
)
|
|
|
|
-sources += gnome.mkenums(
|
|
+daemon_enums_sources += gnome.mkenums(
|
|
enums_types + '.h',
|
|
sources: headers,
|
|
h_template: build_aux_dir / enums_types + '.h.template',
|
|
@@ -296,7 +297,7 @@ endif
|
|
|
|
executable(
|
|
'ModemManager',
|
|
- sources: sources,
|
|
+ sources: sources + daemon_enums_sources,
|
|
include_directories: top_inc,
|
|
dependencies: deps,
|
|
c_args: c_args,
|