aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2015-02-06 16:51:13 +0100
committerAleksander Morgado <aleksander@aleksander.es>2015-02-16 17:30:38 +0100
commit299280166301d00c2b0e2b8868a96013388b2a3f (patch)
tree36f64cbcdaa6279c857cf8cd87c34df50aafbf6d
parent60a17df4c78d7bd9f27ca1425dba6c53298fd3d3 (diff)
sierra: build a common non-inst library with the core Sierra modem support
-rw-r--r--plugins/Makefile.am23
1 files changed, 16 insertions, 7 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index c0c20207..af2f1f30 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -262,10 +262,9 @@ libmm_plugin_hso_la_SOURCES = \
libmm_plugin_hso_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
libmm_plugin_hso_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
-# Sierra
-libmm_plugin_sierra_la_SOURCES = \
- sierra/mm-plugin-sierra.c \
- sierra/mm-plugin-sierra.h \
+# Common Sierra modem support library
+noinst_LTLIBRARIES += libmm-utils-sierra.la
+libmm_utils_sierra_la_SOURCES = \
sierra/mm-common-sierra.c \
sierra/mm-common-sierra.h \
sierra/mm-sim-sierra.c \
@@ -273,12 +272,22 @@ libmm_plugin_sierra_la_SOURCES = \
sierra/mm-broadband-bearer-sierra.c \
sierra/mm-broadband-bearer-sierra.h \
sierra/mm-broadband-modem-sierra.c \
- sierra/mm-broadband-modem-sierra.h \
+ sierra/mm-broadband-modem-sierra.h
+libmm_utils_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_utils_sierra_la_LIBADD = $(GUDEV_LIBS) $(MM_LIBS)
+
+SIERRA_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/sierra
+SIERRA_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-sierra.la
+
+# Sierra
+libmm_plugin_sierra_la_SOURCES = \
+ sierra/mm-plugin-sierra.c \
+ sierra/mm-plugin-sierra.h \
sierra/mm-broadband-modem-sierra-icera.c \
sierra/mm-broadband-modem-sierra-icera.h
-libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS)
+libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS) $(SIERRA_COMMON_COMPILER_FLAGS)
libmm_plugin_sierra_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
-libmm_plugin_sierra_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS)
+libmm_plugin_sierra_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS) $(SIERRA_COMMON_LIBADD_FLAGS)
# Wavecom (Sierra Airlink)
libmm_plugin_wavecom_la_SOURCES = \