qmi: moved QMI implementation to its own subdirectory

12 files changed, 54 insertions, 16 deletions

diff --git a/configure.ac b/configure.ac
index 9f775d39c..54b7f1a67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -350,6 +350,7 @@ libwmc/tests/Makefile
 src/Makefile
 src/port/Makefile
 src/helpers/Makefile
+src/protocol-qmi/Makefile
 src/tests/Makefile
 plugins/Makefile
 uml290/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index f18b0ba6e..82b4ee899 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -16,6 +16,7 @@ PLUGIN_COMMON_COMPILER_FLAGS = \
 	-I$(top_builddir)/src/port \
 	-I$(top_srcdir)/src/helpers \
 	-I$(top_builddir)/src/helpers \
+	-I$(top_srcdir)/src/protocol-qmi \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libmm-glib \
diff --git a/src/Makefile.am b/src/Makefile.am
index a558dc1bc..b6cb039b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,10 @@
 
-SUBDIRS = port helpers . tests
+SUBDIRS = \
+	port         \
+	helpers      \
+	protocol-qmi \
+	.            \
+	tests
 
 udevrulesdir = $(UDEV_BASE_DIR)/rules.d
 udevrules_DATA = \
@@ -58,6 +63,11 @@ ModemManager_LDADD = \
 	$(top_builddir)/libqcdm/src/libqcdm.la \
 	$(top_builddir)/libmm-glib/generated/tests/libmm-test-generated.la
 
+if WITH_QMI
+ModemManager_CPPFLAGS += -I$(srcdir)/protocol-qmi $(QMI_CFLAGS)
+ModemManager_LDADD += $(builddir)/protocol-qmi/libmmprotocolqmi.la $(QMI_LIBS)
+endif
+
 nodist_ModemManager_SOURCES = \
 	mm-daemon-enums-types.h \
 	mm-daemon-enums-types.c
@@ -152,21 +162,6 @@ if SUSPEND_RESUME_UPOWER
 ModemManager_SOURCES += mm-sleep-monitor.h mm-sleep-monitor-upower.c
 endif
 
-# Additional QMI support in ModemManager
-if WITH_QMI
-ModemManager_SOURCES += \
-	mm-sms-qmi.h \
-	mm-sms-qmi.c \
-	mm-sim-qmi.h \
-	mm-sim-qmi.c \
-	mm-bearer-qmi.h \
-	mm-bearer-qmi.c \
-	mm-broadband-modem-qmi.h \
-	mm-broadband-modem-qmi.c
-ModemManager_CPPFLAGS += $(QMI_CFLAGS)
-ModemManager_LDADD += $(QMI_LIBS)
-endif
-
 # Additional MBIM support in ModemManager
 if WITH_MBIM
 ModemManager_SOURCES += \
diff --git a/src/protocol-qmi/Makefile.am b/src/protocol-qmi/Makefile.am
new file mode 100644
index 000000000..86cdcc924
--- /dev/null
+++ b/src/protocol-qmi/Makefile.am
@@ -0,0 +1,41 @@
+
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+
+noinst_LTLIBRARIES =
+
+if WITH_QMI
+
+noinst_LTLIBRARIES += libmmprotocolqmi.la
+
+libmmprotocolqmi_la_CPPFLAGS = \
+	$(MM_CFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	-I$(top_srcdir)/src/port \
+	-I$(top_builddir)/src/port \
+	-I$(top_srcdir)/src/helpers \
+	-I$(top_builddir)/src/helpers \
+	-I$(top_srcdir)/libmm-glib \
+	-I${top_srcdir}/libmm-glib/generated \
+	-I${top_builddir}/libmm-glib/generated \
+	$(QMI_CFLAGS)
+
+if WITH_MBIM
+libmmprotocolqmi_la_CPPFLAGS += $(MBIM_CFLAGS)
+endif
+
+libmmprotocolqmi_la_SOURCES = \
+	mm-sms-qmi.h \
+	mm-sms-qmi.c \
+	mm-sim-qmi.h \
+	mm-sim-qmi.c \
+	mm-bearer-qmi.h \
+	mm-bearer-qmi.c \
+	mm-broadband-modem-qmi.h \
+	mm-broadband-modem-qmi.c
+
+endif
diff --git a/src/mm-bearer-qmi.c b/src/protocol-qmi/mm-bearer-qmi.c
index 74e74f7d6..74e74f7d6 100644
--- a/src/mm-bearer-qmi.c
+++ b/src/protocol-qmi/mm-bearer-qmi.c
diff --git a/src/mm-bearer-qmi.h b/src/protocol-qmi/mm-bearer-qmi.h
index b17f1d4bf..b17f1d4bf 100644
--- a/src/mm-bearer-qmi.h
+++ b/src/protocol-qmi/mm-bearer-qmi.h
diff --git a/src/mm-broadband-modem-qmi.c b/src/protocol-qmi/mm-broadband-modem-qmi.c
index b5cf403f7..b5cf403f7 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/protocol-qmi/mm-broadband-modem-qmi.c
diff --git a/src/mm-broadband-modem-qmi.h b/src/protocol-qmi/mm-broadband-modem-qmi.h
index 6c79e5eb6..6c79e5eb6 100644
--- a/src/mm-broadband-modem-qmi.h
+++ b/src/protocol-qmi/mm-broadband-modem-qmi.h
diff --git a/src/mm-sim-qmi.c b/src/protocol-qmi/mm-sim-qmi.c
index 6254cd3d7..6254cd3d7 100644
--- a/src/mm-sim-qmi.c
+++ b/src/protocol-qmi/mm-sim-qmi.c
diff --git a/src/mm-sim-qmi.h b/src/protocol-qmi/mm-sim-qmi.h
index 070f98f6a..070f98f6a 100644
--- a/src/mm-sim-qmi.h
+++ b/src/protocol-qmi/mm-sim-qmi.h
diff --git a/src/mm-sms-qmi.c b/src/protocol-qmi/mm-sms-qmi.c
index 6f6048446..6f6048446 100644
--- a/src/mm-sms-qmi.c
+++ b/src/protocol-qmi/mm-sms-qmi.c
diff --git a/src/mm-sms-qmi.h b/src/protocol-qmi/mm-sms-qmi.h
index 64a2f300a..64a2f300a 100644
--- a/src/mm-sms-qmi.h
+++ b/src/protocol-qmi/mm-sms-qmi.h