diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2016-10-12 11:10:56 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2016-10-12 11:18:48 +0200 |
| commit | 56ab98f0d29567fa569a386f1f5a907074a80984 (patch) | |
| tree | 5a4e743a67c70b6034520962c00fef0eaa084852 | |
| parent | b032a98b14e447107db2b1ff43c5a8c5fd3277d5 (diff) | |
| download | ModemManager-56ab98f0d29567fa569a386f1f5a907074a80984.tar.gz | |
build: include telit helpers in TELIT_COMMON_LIBADD_FLAGS
The dell plugin needs them.
ModemManager[727]: <warn> [1476194360.614829] [mm-plugin-manager.c:1494] load_plugin():
[plugin manager] could not load plugin '/usr/lib64/ModemManager/libmm-plugin-dell.so':
/usr/lib64/ModemManager/libmm-plugin-dell.so: undefined symbol: mm_telit_get_band_flag
https://bugs.freedesktop.org/show_bug.cgi?id=98207
Reported-by: Lubomir Rintel <lkundrak@v3.sk>
(cherry picked from commit d91752529307ce9ebd73a73ebddb477660342e11)
| -rw-r--r-- | plugins/Makefile.am | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index c8a80c12e..f5348d6ee 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -221,6 +221,26 @@ NOVATEL_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-novatel.la # common telit support ################################################################################ +# Common telit helpers library +noinst_LTLIBRARIES += libhelpers-telit.la +libhelpers_telit_la_SOURCES = \ + telit/mm-modem-helpers-telit.c \ + telit/mm-modem-helpers-telit.h \ + $(NULL) + +noinst_PROGRAMS += test-modem-helpers-telit +test_modem_helpers_telit_SOURCES = \ + telit/tests/test-mm-modem-helpers-telit.c \ + $(NULL) +test_modem_helpers_telit_CPPFLAGS = \ + -I$(top_srcdir)/plugins/telit \ + $(NULL) +test_modem_helpers_telit_LDADD = \ + $(builddir)/libhelpers-telit.la \ + $(top_builddir)/src/libhelpers.la \ + $(top_builddir)/libmm-glib/libmm-glib.la \ + $(NULL) + # Common telit modem support library noinst_LTLIBRARIES += libmm-utils-telit.la libmm_utils_telit_la_SOURCES = \ @@ -231,7 +251,10 @@ libmm_utils_telit_la_SOURCES = \ $(NULL) TELIT_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/telit -TELIT_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-telit.la +TELIT_COMMON_LIBADD_FLAGS = \ + $(builddir)/libhelpers-telit.la \ + $(builddir)/libmm-utils-telit.la \ + $(NULL) ################################################################################ # plugin: generic @@ -748,25 +771,6 @@ libmm_plugin_via_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) # plugin: telit ################################################################################ -noinst_LTLIBRARIES += libhelpers-telit.la -libhelpers_telit_la_SOURCES = \ - telit/mm-modem-helpers-telit.c \ - telit/mm-modem-helpers-telit.h \ - $(NULL) - -noinst_PROGRAMS += test-modem-helpers-telit -test_modem_helpers_telit_SOURCES = \ - telit/tests/test-mm-modem-helpers-telit.c \ - $(NULL) -test_modem_helpers_telit_CPPFLAGS = \ - -I$(top_srcdir)/plugins/telit \ - $(NULL) -test_modem_helpers_telit_LDADD = \ - $(builddir)/libhelpers-telit.la \ - $(top_builddir)/src/libhelpers.la \ - $(top_builddir)/libmm-glib/libmm-glib.la \ - $(NULL) - pkglib_LTLIBRARIES += libmm-plugin-telit.la libmm_plugin_telit_la_SOURCES = \ telit/mm-plugin-telit.c \ @@ -774,7 +778,7 @@ libmm_plugin_telit_la_SOURCES = \ $(NULL) libmm_plugin_telit_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) libmm_plugin_telit_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) -libmm_plugin_telit_la_LIBADD = $(builddir)/libhelpers-telit.la $(TELIT_COMMON_LIBADD_FLAGS) +libmm_plugin_telit_la_LIBADD = $(TELIT_COMMON_LIBADD_FLAGS) dist_udevrules_DATA += telit/77-mm-telit-port-types.rules |