plugins: Fix port enums includes

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.

6 files changed, 6 insertions, 10 deletions

diff --git a/plugins/broadmobi/mm-plugin-broadmobi.c b/plugins/broadmobi/mm-plugin-broadmobi.c
index 6df926d6..0da4a36e 100644
--- a/plugins/broadmobi/mm-plugin-broadmobi.c
+++ b/plugins/broadmobi/mm-plugin-broadmobi.c
@@ -19,7 +19,6 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#include "mm-port-enums-types.h"
 #include "mm-log-object.h"
 #include "mm-plugin-broadmobi.h"
 #include "mm-broadband-modem.h"
diff --git a/plugins/dlink/mm-plugin-dlink.c b/plugins/dlink/mm-plugin-dlink.c
index 7fb0e962..57ecec54 100644
--- a/plugins/dlink/mm-plugin-dlink.c
+++ b/plugins/dlink/mm-plugin-dlink.c
@@ -19,7 +19,6 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#include "mm-port-enums-types.h"
 #include "mm-log-object.h"
 #include "mm-plugin-dlink.h"
 #include "mm-broadband-modem.h"
diff --git a/plugins/meson.build b/plugins/meson.build
index 6bcb3649..b6fe6e2f 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -449,7 +449,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, '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},
   }}
 
diff --git a/plugins/telit/mm-plugin-telit.c b/plugins/telit/mm-plugin-telit.c
index 3532d2fd..3ced94a0 100644
--- a/plugins/telit/mm-plugin-telit.c
+++ b/plugins/telit/mm-plugin-telit.c
@@ -21,7 +21,6 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#include "mm-port-enums-types.h"
 #include "mm-log-object.h"
 #include "mm-modem-helpers.h"
 #include "mm-plugin-telit.h"
diff --git a/plugins/tplink/mm-plugin-tplink.c b/plugins/tplink/mm-plugin-tplink.c
index 4698ba16..5e8a615e 100644
--- a/plugins/tplink/mm-plugin-tplink.c
+++ b/plugins/tplink/mm-plugin-tplink.c
@@ -19,7 +19,6 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#include "mm-port-enums-types.h"
 #include "mm-log-object.h"
 #include "mm-plugin-tplink.h"
 #include "mm-broadband-modem.h"
diff --git a/src/meson.build b/src/meson.build
index 989f8d7b..7991cf52 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -147,15 +147,15 @@ endif
 
 enums_types = 'mm-port-enums-types'
 
-enums_sources = []
-enums_sources += gnome.mkenums(
+port_enums_sources = []
+port_enums_sources += gnome.mkenums(
   enums_types + '.c',
   sources: headers,
   c_template: build_aux_dir / enums_types + '.c.template',
   fhead: '#include "mm-port-enums-types.h"',
 )
 
-enums_sources += gnome.mkenums(
+port_enums_sources += gnome.mkenums(
   enums_types + '.h',
   sources: headers,
   h_template: build_aux_dir / enums_types + '.h.template',
@@ -165,13 +165,13 @@ enums_sources += gnome.mkenums(
 
 libport = static_library(
   'port',
-  sources: sources + enums_sources,
+  sources: sources + port_enums_sources,
   include_directories: top_inc,
   dependencies: deps + private_deps,
 )
 
 libport_dep = declare_dependency(
-  sources: enums_sources[1],
+  sources: port_enums_sources[1],
   include_directories: '.',
   dependencies: deps,
   link_with: libport,