summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2019-11-17 13:45:45 +0100
committerAleksander Morgado <aleksander@aleksander.es>2019-11-27 14:34:26 +0100
commit24981162501d60ae4ce72982781576a7ab770e0f (patch)
tree71bdf5e8848608bfae02d99c4cafce8b7ccb1700
parent7450665fb85fd95e7d56c86c86ee9ffc39dc887b (diff)
icera: setup as loadable 'shared' utils
(cherry picked from commit a6d76cfcebab95c8e6338ab996df07b77f733e37)
-rw-r--r--plugins/Makefile.am15
-rw-r--r--plugins/icera/mm-broadband-modem-icera.h2
-rw-r--r--plugins/icera/mm-shared.c20
3 files changed, 29 insertions, 8 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 38dd460e..1ab024f0 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -138,19 +138,21 @@ test_modem_helpers_icera_LDADD = \
$(top_builddir)/libmm-glib/libmm-glib.la \
$(NULL)
-noinst_LTLIBRARIES += libmm-utils-icera.la
-libmm_utils_icera_la_SOURCES = \
+pkglib_LTLIBRARIES += libmm-shared-icera.la
+libmm_shared_icera_la_SOURCES = \
+ icera/mm-shared.c \
icera/mm-broadband-modem-icera.h \
icera/mm-broadband-modem-icera.c \
icera/mm-broadband-bearer-icera.h \
icera/mm-broadband-bearer-icera.c \
$(NULL)
-libmm_utils_icera_la_LIBADD = \
+libmm_shared_icera_la_CPPFLAGS = $(SHARED_COMMON_COMPILER_FLAGS)
+libmm_shared_icera_la_LDFLAGS = $(SHARED_COMMON_LINKER_FLAGS)
+libmm_shared_icera_la_LIBADD = \
$(builddir)/libhelpers-icera.la \
$(NULL)
ICERA_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/icera
-ICERA_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-icera.la
################################################################################
# common ericsson mbm support
@@ -456,7 +458,7 @@ libmm_plugin_sierra_legacy_la_SOURCES = \
$(NULL)
libmm_plugin_sierra_legacy_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS) $(SIERRA_COMMON_COMPILER_FLAGS)
libmm_plugin_sierra_legacy_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
-libmm_plugin_sierra_legacy_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS) $(SIERRA_COMMON_LIBADD_FLAGS)
+libmm_plugin_sierra_legacy_la_LIBADD = $(SIERRA_COMMON_LIBADD_FLAGS)
################################################################################
# plugin: wavecom (now sierra airlink)
@@ -499,7 +501,6 @@ libmm_plugin_nokia_icera_la_SOURCES = \
$(NULL)
libmm_plugin_nokia_icera_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS)
libmm_plugin_nokia_icera_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
-libmm_plugin_nokia_icera_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS)
dist_udevrules_DATA += nokia/77-mm-nokia-port-types.rules
@@ -522,7 +523,6 @@ libmm_plugin_zte_la_SOURCES = \
$(NULL)
libmm_plugin_zte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS)
libmm_plugin_zte_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
-libmm_plugin_zte_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS)
dist_udevrules_DATA += zte/77-mm-zte-port-types.rules
@@ -687,7 +687,6 @@ libmm_plugin_samsung_la_SOURCES = \
$(NULL)
libmm_plugin_samsung_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS)
libmm_plugin_samsung_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
-libmm_plugin_samsung_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS)
################################################################################
# plugin: cinterion (previously siemens)
diff --git a/plugins/icera/mm-broadband-modem-icera.h b/plugins/icera/mm-broadband-modem-icera.h
index 7826c661..cb88aaf5 100644
--- a/plugins/icera/mm-broadband-modem-icera.h
+++ b/plugins/icera/mm-broadband-modem-icera.h
@@ -42,8 +42,10 @@ struct _MMBroadbandModemIceraClass{
MMBroadbandModemClass parent;
};
+G_MODULE_EXPORT
GType mm_broadband_modem_icera_get_type (void);
+G_MODULE_EXPORT
MMBroadbandModemIcera *mm_broadband_modem_icera_new (const gchar *device,
const gchar **drivers,
const gchar *plugin,
diff --git a/plugins/icera/mm-shared.c b/plugins/icera/mm-shared.c
new file mode 100644
index 00000000..735d61bf
--- /dev/null
+++ b/plugins/icera/mm-shared.c
@@ -0,0 +1,20 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
+ */
+
+#include "mm-shared.h"
+
+MM_SHARED_DEFINE_MAJOR_VERSION
+MM_SHARED_DEFINE_MINOR_VERSION
+MM_SHARED_DEFINE_NAME(Icera)