aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/Makefile.am14
-rw-r--r--plugins/xmm/mm-shared.c20
2 files changed, 27 insertions, 7 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e37a9a8c..781088a2 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -253,8 +253,9 @@ test_modem_helpers_xmm_LDADD = \
$(top_builddir)/libmm-glib/libmm-glib.la \
$(NULL)
-noinst_LTLIBRARIES += libmm-utils-xmm.la
-libmm_utils_xmm_la_SOURCES = \
+pkglib_LTLIBRARIES += libmm-shared-xmm.la
+libmm_shared_xmm_la_SOURCES = \
+ xmm/mm-shared.c \
xmm/mm-shared-xmm.h \
xmm/mm-shared-xmm.c \
xmm/mm-broadband-modem-xmm.h \
@@ -262,18 +263,19 @@ libmm_utils_xmm_la_SOURCES = \
$(NULL)
if WITH_MBIM
-libmm_utils_xmm_la_SOURCES += \
+libmm_shared_xmm_la_SOURCES += \
xmm/mm-broadband-modem-mbim-xmm.h \
xmm/mm-broadband-modem-mbim-xmm.c \
$(NULL)
endif
-libmm_utils_xmm_la_LIBADD = \
+libmm_shared_xmm_la_CPPFLAGS = $(SHARED_COMMON_COMPILER_FLAGS)
+libmm_shared_xmm_la_LDFLAGS = $(SHARED_COMMON_LINKER_FLAGS)
+libmm_shared_xmm_la_LIBADD = \
$(builddir)/libhelpers-xmm.la \
$(NULL)
XMM_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/xmm
-XMM_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-xmm.la
################################################################################
# common foxconn support
@@ -1133,7 +1135,6 @@ libmm_plugin_dell_la_CPPFLAGS = \
libmm_plugin_dell_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
libmm_plugin_dell_la_LIBADD = \
$(TELIT_COMMON_LIBADD_FLAGS) \
- $(XMM_COMMON_LIBADD_FLAGS) \
$(FOXCONN_COMMON_LIBADD_FLAGS) \
$(NULL)
@@ -1178,7 +1179,6 @@ libmm_plugin_fibocom_la_SOURCES = \
$(NULL)
libmm_plugin_fibocom_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(XMM_COMMON_COMPILER_FLAGS)
libmm_plugin_fibocom_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
-libmm_plugin_fibocom_la_LIBADD = $(XMM_COMMON_LIBADD_FLAGS)
dist_udevrules_DATA += fibocom/77-mm-fibocom-port-types.rules
diff --git a/plugins/xmm/mm-shared.c b/plugins/xmm/mm-shared.c
new file mode 100644
index 00000000..203f0fbb
--- /dev/null
+++ b/plugins/xmm/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(Xmm)