colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plugins: Fix port enums includes

Browse Source 
The `broadmobi`, `dlink`, `telit` and `tplink` plugins include the
`mm-port-enums-types.h` header. However, they do not use any symbol
defined there.

The `huawei` plugin as includes the `mm-port-enums-types.h` header
but it does not include the build targets as dependencies.

These issues have been fixed by removing the unnecessary includes
from `broadmobi`, `dlink`, `telit` and `tplink` plugins and by
including the enums build target in the `huawei` target.
This commit is contained in:
Iñigo Martínez
2022-03-01 08:29:54 +01:00
parent 17dca109dd
commit 2bc697ce32
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/broadmobi/mm-plugin-broadmobi.c
View File

@@ -19,7 +19,6 @@
#define _LIBMM_INSIDE_MM #define _LIBMM_INSIDE_MM
#include <libmm-glib.h> #include <libmm-glib.h>
#include "mm-port-enums-types.h"
#include "mm-log-object.h" #include "mm-log-object.h"
#include "mm-plugin-broadmobi.h" #include "mm-plugin-broadmobi.h"
#include "mm-broadband-modem.h" #include "mm-broadband-modem.h"

1
plugins/dlink/mm-plugin-dlink.c
View File

@@ -19,7 +19,6 @@
#define _LIBMM_INSIDE_MM #define _LIBMM_INSIDE_MM
#include <libmm-glib.h> #include <libmm-glib.h>
#include "mm-port-enums-types.h"
#include "mm-log-object.h" #include "mm-log-object.h"
#include "mm-plugin-dlink.h" #include "mm-plugin-dlink.h"
#include "mm-broadband-modem.h" #include "mm-broadband-modem.h"

2
plugins/meson.build
View File

@@ -449,7 +449,7 @@ if plugins_options['huawei']
plugins += {'plugin-huawei': { plugins += {'plugin-huawei': {
'plugin': true, '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"']}, '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, '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"']},
'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep}, 'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep},
}} }}

1
plugins/telit/mm-plugin-telit.c
View File

@@ -21,7 +21,6 @@
#define _LIBMM_INSIDE_MM #define _LIBMM_INSIDE_MM
#include <libmm-glib.h> #include <libmm-glib.h>
#include "mm-port-enums-types.h"
#include "mm-log-object.h" #include "mm-log-object.h"
#include "mm-modem-helpers.h" #include "mm-modem-helpers.h"
#include "mm-plugin-telit.h" #include "mm-plugin-telit.h"

1
plugins/tplink/mm-plugin-tplink.c
View File

@@ -19,7 +19,6 @@
#define _LIBMM_INSIDE_MM #define _LIBMM_INSIDE_MM
#include <libmm-glib.h> #include <libmm-glib.h>
#include "mm-port-enums-types.h"
#include "mm-log-object.h" #include "mm-log-object.h"
#include "mm-plugin-tplink.h" #include "mm-plugin-tplink.h"
#include "mm-broadband-modem.h" #include "mm-broadband-modem.h"

10
src/meson.build
View File

@@ -147,15 +147,15 @@ endif
enums_types = 'mm-port-enums-types' enums_types = 'mm-port-enums-types'
enums_sources = [] port_enums_sources = []
enums_sources += gnome.mkenums( port_enums_sources += gnome.mkenums(
enums_types + '.c', enums_types + '.c',
sources: headers, sources: headers,
c_template: build_aux_dir / enums_types + '.c.template', c_template: build_aux_dir / enums_types + '.c.template',
fhead: '#include "mm-port-enums-types.h"', fhead: '#include "mm-port-enums-types.h"',
) )
enums_sources += gnome.mkenums( port_enums_sources += gnome.mkenums(
enums_types + '.h', enums_types + '.h',
sources: headers, sources: headers,
h_template: build_aux_dir / enums_types + '.h.template', h_template: build_aux_dir / enums_types + '.h.template',
@@ -165,13 +165,13 @@ enums_sources += gnome.mkenums(
libport = static_library( libport = static_library(
'port', 'port',
sources: sources + enums_sources, sources: sources + port_enums_sources,
include_directories: top_inc, include_directories: top_inc,
dependencies: deps + private_deps, dependencies: deps + private_deps,
) )
libport_dep = declare_dependency( libport_dep = declare_dependency(
sources: enums_sources[1], sources: port_enums_sources[1],
include_directories: '.', include_directories: '.',
dependencies: deps, dependencies: deps,
link_with: libport, link_with: libport,