diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2019-11-17 14:12:40 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2019-11-27 14:34:26 +0100 |
| commit | 7f9a41beddfa98474a9dcc272d9db0c2a234943a (patch) | |
| tree | a330c4386355f452503439fb6612bcd50ccc07c0 | |
| parent | 39b9ce58b8e0355869d64a15418094f42bc0ca5f (diff) | |
option: setup as loadable 'shared' utils
(cherry picked from commit 2d779b97c4b7c79fff00f17d25b0c210de384f00)
| -rw-r--r-- | plugins/Makefile.am | 10 | ||||
| -rw-r--r-- | plugins/option/mm-shared.c | 20 |
2 files changed, 25 insertions, 5 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index d0952091..2e47cc69 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -201,14 +201,16 @@ SIERRA_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/sierra # common option support ################################################################################ -noinst_LTLIBRARIES += libmm-utils-option.la -libmm_utils_option_la_SOURCES = \ +pkglib_LTLIBRARIES += libmm-shared-option.la +libmm_shared_option_la_SOURCES = \ + option/mm-shared.c \ option/mm-broadband-modem-option.c \ option/mm-broadband-modem-option.h \ $(NULL) +libmm_shared_option_la_CPPFLAGS = $(SHARED_COMMON_COMPILER_FLAGS) +libmm_shared_option_la_LDFLAGS = $(SHARED_COMMON_LINKER_FLAGS) OPTION_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/option -OPTION_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-option.la ################################################################################ # common novatel support @@ -400,7 +402,6 @@ libmm_plugin_option_la_SOURCES = \ $(NULL) libmm_plugin_option_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(OPTION_COMMON_COMPILER_FLAGS) libmm_plugin_option_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) -libmm_plugin_option_la_LIBADD = $(OPTION_COMMON_LIBADD_FLAGS) ################################################################################ # plugin: option hso @@ -417,7 +418,6 @@ libmm_plugin_option_hso_la_SOURCES = \ $(NULL) libmm_plugin_option_hso_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(OPTION_COMMON_COMPILER_FLAGS) libmm_plugin_option_hso_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) -libmm_plugin_option_hso_la_LIBADD = $(OPTION_COMMON_LIBADD_FLAGS) ################################################################################ # plugin: sierra (new QMI or MBIM modems) diff --git a/plugins/option/mm-shared.c b/plugins/option/mm-shared.c new file mode 100644 index 00000000..3f89d86a --- /dev/null +++ b/plugins/option/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(Option) |