voice: moved 'Voice' interface details to its own subdirectory

10 files changed, 41 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index 49ff57638..ae77d6eb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,6 +352,7 @@ src/port/Makefile
 src/helpers/Makefile
 src/protocol-qmi/Makefile
 src/protocol-mbim/Makefile
+src/iface-voice/Makefile
 src/tests/Makefile
 plugins/Makefile
 uml290/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index c26448db0..45ffcb42b 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -18,6 +18,7 @@ PLUGIN_COMMON_COMPILER_FLAGS = \
 	-I$(top_builddir)/src/helpers \
 	-I$(top_srcdir)/src/protocol-qmi \
 	-I$(top_srcdir)/src/protocol-mbim \
+	-I$(top_srcdir)/src/iface-voice \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libmm-glib \
diff --git a/src/Makefile.am b/src/Makefile.am
index 786b1f70e..0bc69e2cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
 	helpers       \
 	protocol-qmi  \
 	protocol-mbim \
+	iface-voice   \
 	.             \
 	tests
 
@@ -45,6 +46,7 @@ ModemManager_CPPFLAGS = \
 	-I$(builddir)/port \
 	-I$(srcdir)/helpers \
 	-I$(builddir)/helpers \
+	-I$(srcdir)/iface-voice \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
@@ -61,6 +63,7 @@ ModemManager_LDADD = \
 	$(GUDEV_LIBS) \
 	$(builddir)/helpers/libhelpers.la \
 	$(builddir)/port/libport.la \
+	$(builddir)/iface-voice/libmmifacevoice.la \
 	$(top_builddir)/libqcdm/src/libqcdm.la \
 	$(top_builddir)/libmm-glib/generated/tests/libmm-test-generated.la
 
@@ -110,12 +113,8 @@ ModemManager_SOURCES = \
 	mm-base-modem.c \
 	mm-base-sms.h \
 	mm-base-sms.c \
-	mm-base-call.h \
-	mm-base-call.c \
 	mm-sms-list.h \
 	mm-sms-list.c \
-	mm-call-list.h \
-	mm-call-list.c \
 	mm-iface-modem.h \
 	mm-iface-modem.c \
 	mm-iface-modem-3gpp.h \
@@ -130,8 +129,6 @@ ModemManager_SOURCES = \
 	mm-iface-modem-location.c \
 	mm-iface-modem-messaging.h \
 	mm-iface-modem-messaging.c \
-	mm-iface-modem-voice.h \
-	mm-iface-modem-voice.c \
 	mm-iface-modem-time.h \
 	mm-iface-modem-time.c \
 	mm-iface-modem-firmware.h \
diff --git a/src/iface-voice/Makefile.am b/src/iface-voice/Makefile.am
new file mode 100644
index 000000000..2b7dafc72
--- /dev/null
+++ b/src/iface-voice/Makefile.am
@@ -0,0 +1,36 @@
+
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+
+noinst_LTLIBRARIES = libmmifacevoice.la
+
+libmmifacevoice_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
+
+if WITH_QMI
+libmmifacevoice_la_CPPFLAGS += $(QMI_CFLAGS)
+endif
+
+if WITH_MBIM
+libmmifacevoice_la_CPPFLAGS += $(MBIM_CFLAGS)
+endif
+
+libmmifacevoice_la_SOURCES = \
+	mm-base-call.h \
+	mm-base-call.c \
+	mm-call-list.h \
+	mm-call-list.c \
+	mm-iface-modem-voice.h \
+	mm-iface-modem-voice.c
diff --git a/src/mm-base-call.c b/src/iface-voice/mm-base-call.c
index 07b8bf16e..07b8bf16e 100644
--- a/src/mm-base-call.c
+++ b/src/iface-voice/mm-base-call.c
diff --git a/src/mm-base-call.h b/src/iface-voice/mm-base-call.h
index ff57fb594..ff57fb594 100644
--- a/src/mm-base-call.h
+++ b/src/iface-voice/mm-base-call.h
diff --git a/src/mm-call-list.c b/src/iface-voice/mm-call-list.c
index 056e2932c..056e2932c 100644
--- a/src/mm-call-list.c
+++ b/src/iface-voice/mm-call-list.c
diff --git a/src/mm-call-list.h b/src/iface-voice/mm-call-list.h
index 583516662..583516662 100644
--- a/src/mm-call-list.h
+++ b/src/iface-voice/mm-call-list.h
diff --git a/src/mm-iface-modem-voice.c b/src/iface-voice/mm-iface-modem-voice.c
index ca65238b7..ca65238b7 100644
--- a/src/mm-iface-modem-voice.c
+++ b/src/iface-voice/mm-iface-modem-voice.c
diff --git a/src/mm-iface-modem-voice.h b/src/iface-voice/mm-iface-modem-voice.h
index e182060a8..e182060a8 100644
--- a/src/mm-iface-modem-voice.h
+++ b/src/iface-voice/mm-iface-modem-voice.h