Merge request !1447 from 'fix-rolling-single-plugin-build'
rolling: fix single plugin build https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1447
This commit is contained in:
+11
-10
@@ -143,9 +143,19 @@ if plugins_shared['mtk']
|
|||||||
'mtk/mm-shared-mtk.c',
|
'mtk/mm-shared-mtk.c',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
incs = plugins_incs
|
||||||
|
if enable_mbim
|
||||||
|
incs += [fibocom_inc]
|
||||||
|
sources += files(
|
||||||
|
'mtk/mm-bearer-mbim-mtk-fibocom.c',
|
||||||
|
'mtk/mm-broadband-modem-mbim-mtk.c',
|
||||||
|
'mtk/mm-broadband-modem-mbim-mtk-fibocom.c',
|
||||||
|
)
|
||||||
|
endif
|
||||||
|
|
||||||
plugins += {'shared-mtk': {
|
plugins += {'shared-mtk': {
|
||||||
'plugin': false,
|
'plugin': false,
|
||||||
'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': c_args},
|
'module': {'sources': sources, 'include_directories': incs, 'c_args': c_args},
|
||||||
}}
|
}}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -758,15 +768,6 @@ if plugins_options['mtk']
|
|||||||
'mtk/mm-plugin-mtk.c',
|
'mtk/mm-plugin-mtk.c',
|
||||||
)
|
)
|
||||||
|
|
||||||
if enable_mbim
|
|
||||||
incs += [fibocom_inc]
|
|
||||||
sources += files(
|
|
||||||
'mtk/mm-bearer-mbim-mtk-fibocom.c',
|
|
||||||
'mtk/mm-broadband-modem-mbim-mtk.c',
|
|
||||||
'mtk/mm-broadband-modem-mbim-mtk-fibocom.c',
|
|
||||||
)
|
|
||||||
endif
|
|
||||||
|
|
||||||
plugins += {'plugin-mtk': {
|
plugins += {'plugin-mtk': {
|
||||||
'plugin': true,
|
'plugin': true,
|
||||||
'module': {'sources': sources, 'include_directories': incs, 'c_args': '-DMM_MODULE_NAME="mtk"'},
|
'module': {'sources': sources, 'include_directories': incs, 'c_args': '-DMM_MODULE_NAME="mtk"'},
|
||||||
|
|||||||
Reference in New Issue
Block a user