diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2019-11-17 14:14:17 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2019-11-28 08:50:46 +0100 |
| commit | 999632c1075133fdd466c5dee1141695c4dd943e (patch) | |
| tree | 4e6ac05ae0086feaf6dcdcb04a713bf4861a952f | |
| parent | be73857103474f874dac82879474ee21cd8deecd (diff) | |
| download | ModemManager-999632c1075133fdd466c5dee1141695c4dd943e.tar.gz | |
novatel: setup as loadable 'shared' utils
(cherry picked from commit b765e88e5718ddaad968fb079bcc98f55808a353)
| -rw-r--r-- | plugins/Makefile.am | 10 | ||||
| -rw-r--r-- | plugins/novatel/mm-shared.c | 20 |
2 files changed, 25 insertions, 5 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 24a0d3576..d994c0e28 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -214,16 +214,18 @@ OPTION_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/option ################################################################################ # Common Novatel modem support library -noinst_LTLIBRARIES += libmm-utils-novatel.la -libmm_utils_novatel_la_SOURCES = \ +pkglib_LTLIBRARIES += libmm-shared-novatel.la +libmm_shared_novatel_la_SOURCES = \ + novatel/mm-shared.c \ novatel/mm-common-novatel.c \ novatel/mm-common-novatel.h \ novatel/mm-broadband-modem-novatel.c \ novatel/mm-broadband-modem-novatel.h \ $(NULL) +libmm_shared_novatel_la_CPPFLAGS = $(SHARED_COMMON_COMPILER_FLAGS) +libmm_shared_novatel_la_LDFLAGS = $(SHARED_COMMON_LINKER_FLAGS) NOVATEL_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/novatel -NOVATEL_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-novatel.la ################################################################################ # common xmm support @@ -773,7 +775,6 @@ libmm_plugin_novatel_la_SOURCES = \ $(NULL) libmm_plugin_novatel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(NOVATEL_COMMON_COMPILER_FLAGS) libmm_plugin_novatel_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) -libmm_plugin_novatel_la_LIBADD = $(NOVATEL_COMMON_LIBADD_FLAGS) ################################################################################ # plugin: altair lte @@ -1062,7 +1063,6 @@ libmm_plugin_dell_la_CPPFLAGS = \ $(NULL) libmm_plugin_dell_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) libmm_plugin_dell_la_LIBADD = \ - $(NOVATEL_COMMON_LIBADD_FLAGS) \ $(TELIT_COMMON_LIBADD_FLAGS) \ $(XMM_COMMON_LIBADD_FLAGS) \ $(NULL) diff --git a/plugins/novatel/mm-shared.c b/plugins/novatel/mm-shared.c new file mode 100644 index 000000000..6bd11e4b1 --- /dev/null +++ b/plugins/novatel/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(Novatel) |