location: moved 'Location' interface details to its own subdirectory

7 files changed, 38 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 230f5edb1..ab22b1f62 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-location/Makefile
 src/iface-signal/Makefile
 src/iface-firmware/Makefile
 src/iface-time/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index d267a53af..b5493231d 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-location \
 	-I$(top_srcdir)/src/iface-time \
 	-I$(top_srcdir)/src/iface-voice \
 	-I$(top_srcdir)/include \
diff --git a/src/Makefile.am b/src/Makefile.am
index c83138a5b..919338690 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
 	helpers        \
 	protocol-qmi   \
 	protocol-mbim  \
+	iface-location \
 	iface-signal   \
 	iface-firmware \
 	iface-time     \
@@ -50,6 +51,7 @@ ModemManager_CPPFLAGS = \
 	-I$(builddir)/port \
 	-I$(srcdir)/helpers \
 	-I$(builddir)/helpers \
+	-I$(srcdir)/iface-location \
 	-I$(srcdir)/iface-voice \
 	-I$(srcdir)/iface-oma \
 	-I$(srcdir)/iface-time \
@@ -71,6 +73,7 @@ ModemManager_LDADD = \
 	$(GUDEV_LIBS) \
 	$(builddir)/helpers/libhelpers.la \
 	$(builddir)/port/libport.la \
+	$(builddir)/iface-location/libmmifacelocation.la \
 	$(builddir)/iface-signal/libmmifacesignal.la \
 	$(builddir)/iface-firmware/libmmifacefirmware.la \
 	$(builddir)/iface-time/libmmifacetime.la \
@@ -137,8 +140,6 @@ ModemManager_SOURCES = \
 	mm-iface-modem-cdma.c \
 	mm-iface-modem-simple.h \
 	mm-iface-modem-simple.c \
-	mm-iface-modem-location.h \
-	mm-iface-modem-location.c \
 	mm-iface-modem-messaging.h \
 	mm-iface-modem-messaging.c \
 	mm-broadband-modem.h \
diff --git a/src/iface-location/Makefile.am b/src/iface-location/Makefile.am
new file mode 100644
index 000000000..eba44f1a1
--- /dev/null
+++ b/src/iface-location/Makefile.am
@@ -0,0 +1,32 @@
+
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+
+noinst_LTLIBRARIES = libmmifacelocation.la
+
+libmmifacelocation_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
+libmmifacelocation_la_CPPFLAGS += $(QMI_CFLAGS)
+endif
+
+if WITH_MBIM
+libmmifacelocation_la_CPPFLAGS += $(MBIM_CFLAGS)
+endif
+
+libmmifacelocation_la_SOURCES = \
+	mm-iface-modem-location.h \
+	mm-iface-modem-location.c
diff --git a/src/mm-iface-modem-location.c b/src/iface-location/mm-iface-modem-location.c
index a15942d5d..a15942d5d 100644
--- a/src/mm-iface-modem-location.c
+++ b/src/iface-location/mm-iface-modem-location.c
diff --git a/src/mm-iface-modem-location.h b/src/iface-location/mm-iface-modem-location.h
index 96fe9b3b5..96fe9b3b5 100644
--- a/src/mm-iface-modem-location.h
+++ b/src/iface-location/mm-iface-modem-location.h
diff --git a/src/protocol-qmi/Makefile.am b/src/protocol-qmi/Makefile.am
index 0a69b7fe0..372d03576 100644
--- a/src/protocol-qmi/Makefile.am
+++ b/src/protocol-qmi/Makefile.am
@@ -19,6 +19,7 @@ libmmprotocolqmi_la_CPPFLAGS = \
 	-I$(top_builddir)/src/port \
 	-I$(top_srcdir)/src/helpers \
 	-I$(top_builddir)/src/helpers \
+	-I$(top_srcdir)/src/iface-location \
 	-I$(top_srcdir)/src/iface-signal \
 	-I$(top_srcdir)/src/iface-firmware \
 	-I$(top_srcdir)/src/iface-oma \