libport: moved to its own subdirectory

23 files changed, 99 insertions, 72 deletions

diff --git a/.gitignore b/.gitignore
index 3c020e607..fa5346e52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,9 +46,9 @@ Makefile.in
 /src/ModemManager
 /src/mm-daemon-enums-types.c
 /src/mm-daemon-enums-types.h
-/src/mm-port-enums-types.c
-/src/mm-port-enums-types.h
 /src/mm-marshal.[ch]
+/src/port/mm-port-enums-types.c
+/src/port/mm-port-enums-types.h
 /src/tests/test-modem-helpers
 /src/tests/test-modem-helpers-qmi
 /src/tests/test-charsets
diff --git a/configure.ac b/configure.ac
index 26711ae5b..a47925d91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,6 +348,7 @@ libwmc/Makefile
 libwmc/src/Makefile
 libwmc/tests/Makefile
 src/Makefile
+src/port/Makefile
 src/tests/Makefile
 plugins/Makefile
 uml290/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 3cc5e2ff1..07255a3c8 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -12,6 +12,8 @@ PLUGIN_COMMON_COMPILER_FLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
+	-I$(top_srcdir)/src/port \
+	-I$(top_builddir)/src/port \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libmm-glib \
diff --git a/src/Makefile.am b/src/Makefile.am
index 2afcd9af7..c77602f91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS=. tests
+
+SUBDIRS = port . tests
 
 udevrulesdir = $(UDEV_BASE_DIR)/rules.d
 udevrules_DATA = \
@@ -11,7 +12,7 @@ udevrules_DATA = \
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
 
-noinst_LTLIBRARIES = libmodem-helpers.la libport.la
+noinst_LTLIBRARIES = libmodem-helpers.la
 
 libmodem_helpers_la_CPPFLAGS = \
 	$(MM_CFLAGS) \
@@ -55,67 +56,6 @@ libmodem_helpers_la_SOURCES += \
 libmodem_helpers_la_CPPFLAGS += $(MBIM_CFLAGS)
 endif
 
-# libport specific enum types
-PORT_ENUMS = \
-	$(srcdir)/mm-port.h \
-	$(srcdir)/mm-port-serial-at.h
-
-mm-port-enums-types.h: Makefile.am $(PORT_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h
-	$(AM_V_GEN) $(GLIB_MKENUMS) \
-		--fhead "#include \"mm-port.h\"\n#include \"mm-port-serial-at.h\"\n#ifndef __MM_PORT_ENUMS_TYPES_H__\n#define __MM_PORT_ENUMS_TYPES_H__\n" \
-		--template $(top_srcdir)/build-aux/mm-enums-template.h \
-		--ftail "#endif /* __MM_PORT_ENUMS_TYPES_H__ */\n" \
-		$(PORT_ENUMS) > $@
-
-mm-port-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-port-enums-types.h
-	$(AM_V_GEN) $(GLIB_MKENUMS) \
-		--fhead "#include \"mm-port-enums-types.h\"" \
-		--template $(top_srcdir)/build-aux/mm-enums-template.c \
-		$(PORT_ENUMS) > $@
-
-libport_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libmm-glib \
-	-I${top_srcdir}/libmm-glib/generated \
-	-I${top_builddir}/libmm-glib/generated
-
-nodist_libport_la_SOURCES = \
-	mm-port-enums-types.h \
-	mm-port-enums-types.c
-
-libport_la_SOURCES = \
-	mm-port.c \
-	mm-port.h \
-	mm-port-serial.c \
-	mm-port-serial.h \
-	mm-port-serial-at.c \
-	mm-port-serial-at.h \
-	mm-port-serial-qcdm.c \
-	mm-port-serial-qcdm.h \
-	mm-port-serial-gps.c \
-	mm-port-serial-gps.h \
-	mm-serial-parsers.c \
-	mm-serial-parsers.h
-
-# Additional QMI support in libserial
-if WITH_QMI
-libport_la_SOURCES += \
-	mm-port-qmi.c \
-	mm-port-qmi.h
-libport_la_CPPFLAGS += $(QMI_CFLAGS)
-endif
-
-# Additional MBIM support in libserial
-if WITH_MBIM
-libport_la_SOURCES += \
-	mm-port-mbim.c \
-	mm-port-mbim.h
-libport_la_CPPFLAGS += $(MBIM_CFLAGS)
-endif
-
 # Daemon specific enum types
 DAEMON_ENUMS = \
 	$(srcdir)/mm-base-bearer.h \
@@ -139,6 +79,8 @@ sbin_PROGRAMS = ModemManager
 ModemManager_CPPFLAGS = \
 	$(MM_CFLAGS) \
 	$(GUDEV_CFLAGS) \
+	-I$(srcdir)/port \
+	-I$(builddir)/port \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
@@ -154,7 +96,7 @@ ModemManager_LDADD = \
 	$(MM_LIBS) \
 	$(GUDEV_LIBS) \
 	$(builddir)/libmodem-helpers.la \
-	$(builddir)/libport.la \
+	$(builddir)/port/libport.la \
 	$(top_builddir)/libqcdm/src/libqcdm.la \
 	$(top_builddir)/libmm-glib/generated/tests/libmm-test-generated.la
 
@@ -289,8 +231,6 @@ EXTRA_DIST = \
 # Request to build enum types before anything else
 BUILT_SOURCES = \
 	mm-daemon-enums-types.h \
-	mm-daemon-enums-types.c \
-	mm-port-enums-types.h \
-	mm-port-enums-types.c
+	mm-daemon-enums-types.c
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/port/Makefile.am b/src/port/Makefile.am
new file mode 100644
index 000000000..145692cce
--- /dev/null
+++ b/src/port/Makefile.am
@@ -0,0 +1,75 @@
+
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+
+noinst_LTLIBRARIES = libport.la
+
+# libport specific enum types
+PORT_ENUMS = \
+	$(srcdir)/mm-port.h \
+	$(srcdir)/mm-port-serial-at.h
+
+mm-port-enums-types.h: Makefile.am $(PORT_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h
+	$(AM_V_GEN) $(GLIB_MKENUMS) \
+		--fhead "#include \"mm-port.h\"\n#include \"mm-port-serial-at.h\"\n#ifndef __MM_PORT_ENUMS_TYPES_H__\n#define __MM_PORT_ENUMS_TYPES_H__\n" \
+		--template $(top_srcdir)/build-aux/mm-enums-template.h \
+		--ftail "#endif /* __MM_PORT_ENUMS_TYPES_H__ */\n" \
+		$(PORT_ENUMS) > $@
+
+mm-port-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-port-enums-types.h
+	$(AM_V_GEN) $(GLIB_MKENUMS) \
+		--fhead "#include \"mm-port-enums-types.h\"" \
+		--template $(top_srcdir)/build-aux/mm-enums-template.c \
+		$(PORT_ENUMS) > $@
+
+libport_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)/libmm-glib \
+	-I${top_srcdir}/libmm-glib/generated \
+	-I${top_builddir}/libmm-glib/generated
+
+nodist_libport_la_SOURCES = \
+	mm-port-enums-types.h \
+	mm-port-enums-types.c
+
+libport_la_SOURCES = \
+	mm-port.c \
+	mm-port.h \
+	mm-port-serial.c \
+	mm-port-serial.h \
+	mm-port-serial-at.c \
+	mm-port-serial-at.h \
+	mm-port-serial-qcdm.c \
+	mm-port-serial-qcdm.h \
+	mm-port-serial-gps.c \
+	mm-port-serial-gps.h \
+	mm-serial-parsers.c \
+	mm-serial-parsers.h
+
+# Additional QMI support in libserial
+if WITH_QMI
+libport_la_SOURCES += \
+	mm-port-qmi.c \
+	mm-port-qmi.h
+libport_la_CPPFLAGS += $(QMI_CFLAGS)
+endif
+
+# Additional MBIM support in libserial
+if WITH_MBIM
+libport_la_SOURCES += \
+	mm-port-mbim.c \
+	mm-port-mbim.h
+libport_la_CPPFLAGS += $(MBIM_CFLAGS)
+endif
+
+# Request to build enum types before anything else
+BUILT_SOURCES = \
+	mm-port-enums-types.h \
+	mm-port-enums-types.c
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/mm-port-mbim.c b/src/port/mm-port-mbim.c
index 2b649963c..2b649963c 100644
--- a/src/mm-port-mbim.c
+++ b/src/port/mm-port-mbim.c
diff --git a/src/mm-port-mbim.h b/src/port/mm-port-mbim.h
index 738f1c552..738f1c552 100644
--- a/src/mm-port-mbim.h
+++ b/src/port/mm-port-mbim.h
diff --git a/src/mm-port-qmi.c b/src/port/mm-port-qmi.c
index 33519ee79..33519ee79 100644
--- a/src/mm-port-qmi.c
+++ b/src/port/mm-port-qmi.c
diff --git a/src/mm-port-qmi.h b/src/port/mm-port-qmi.h
index 2724140a6..2724140a6 100644
--- a/src/mm-port-qmi.h
+++ b/src/port/mm-port-qmi.h
diff --git a/src/mm-port-serial-at.c b/src/port/mm-port-serial-at.c
index 8e2aa2aa7..8e2aa2aa7 100644
--- a/src/mm-port-serial-at.c
+++ b/src/port/mm-port-serial-at.c
diff --git a/src/mm-port-serial-at.h b/src/port/mm-port-serial-at.h
index 8e19409e9..8e19409e9 100644
--- a/src/mm-port-serial-at.h
+++ b/src/port/mm-port-serial-at.h
diff --git a/src/mm-port-serial-gps.c b/src/port/mm-port-serial-gps.c
index b316d05eb..b316d05eb 100644
--- a/src/mm-port-serial-gps.c
+++ b/src/port/mm-port-serial-gps.c
diff --git a/src/mm-port-serial-gps.h b/src/port/mm-port-serial-gps.h
index 5655b5e3a..5655b5e3a 100644
--- a/src/mm-port-serial-gps.h
+++ b/src/port/mm-port-serial-gps.h
diff --git a/src/mm-port-serial-qcdm.c b/src/port/mm-port-serial-qcdm.c
index 7732851fc..7732851fc 100644
--- a/src/mm-port-serial-qcdm.c
+++ b/src/port/mm-port-serial-qcdm.c
diff --git a/src/mm-port-serial-qcdm.h b/src/port/mm-port-serial-qcdm.h
index 5e3e38f53..5e3e38f53 100644
--- a/src/mm-port-serial-qcdm.h
+++ b/src/port/mm-port-serial-qcdm.h
diff --git a/src/mm-port-serial.c b/src/port/mm-port-serial.c
index 92ad48125..92ad48125 100644
--- a/src/mm-port-serial.c
+++ b/src/port/mm-port-serial.c
diff --git a/src/mm-port-serial.h b/src/port/mm-port-serial.h
index 708e39123..708e39123 100644
--- a/src/mm-port-serial.h
+++ b/src/port/mm-port-serial.h
diff --git a/src/mm-port.c b/src/port/mm-port.c
index 0ee9a199e..0ee9a199e 100644
--- a/src/mm-port.c
+++ b/src/port/mm-port.c
diff --git a/src/mm-port.h b/src/port/mm-port.h
index 8ac6829ad..8ac6829ad 100644
--- a/src/mm-port.h
+++ b/src/port/mm-port.h
diff --git a/src/mm-serial-parsers.c b/src/port/mm-serial-parsers.c
index b7bb30874..b7bb30874 100644
--- a/src/mm-serial-parsers.c
+++ b/src/port/mm-serial-parsers.c
diff --git a/src/mm-serial-parsers.h b/src/port/mm-serial-parsers.h
index 641c5e0f3..641c5e0f3 100644
--- a/src/mm-serial-parsers.h
+++ b/src/port/mm-serial-parsers.h
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 0804b14f5..1dfe80cfd 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -97,6 +97,9 @@ test_qcdm_serial_port_CPPFLAGS = \
 	$(MM_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	-I$(top_srcdir)/src/port \
+	-I$(top_builddir)/src/port \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libmm-glib \
@@ -105,7 +108,7 @@ test_qcdm_serial_port_CPPFLAGS = \
 
 test_qcdm_serial_port_LDADD = \
 	$(MM_LIBS) \
-	$(top_builddir)/src/libport.la \
+	$(top_builddir)/src/port/libport.la \
 	$(top_builddir)/src/libmodem-helpers.la \
 	$(top_builddir)/libqcdm/src/libqcdm.la \
 	-lutil
@@ -124,6 +127,9 @@ test_at_serial_port_CPPFLAGS = \
 	$(MM_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	-I$(top_srcdir)/src/port \
+	-I$(top_builddir)/src/port \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libmm-glib \
@@ -132,7 +138,7 @@ test_at_serial_port_CPPFLAGS = \
 
 test_at_serial_port_LDADD = \
 	$(MM_LIBS) \
-	$(top_builddir)/src/libport.la \
+	$(top_builddir)/src/port/libport.la \
 	$(top_builddir)/src/libmodem-helpers.la \
 	-lutil
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 6e6779ac8..1711707a4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -10,6 +10,9 @@ mmtty_CPPFLAGS = \
 	$(MM_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	-I$(top_srcdir)/src/port \
+	-I$(top_builddir)/src/port \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libmm-glib \
@@ -17,7 +20,7 @@ mmtty_CPPFLAGS = \
 	-I$(top_builddir)/libmm-glib/generated
 mmtty_LDADD = \
 	$(MM_LIBS) \
-	$(top_builddir)/src/libport.la \
+	$(top_builddir)/src/port/libport.la \
 	$(top_builddir)/src/libmodem-helpers.la
 
 EXTRA_DIST = \