helpers: moved to its own subdirectory

24 files changed, 82 insertions, 60 deletions

diff --git a/configure.ac b/configure.ac
index a47925d91..9f775d39c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,6 +349,7 @@ libwmc/src/Makefile
 libwmc/tests/Makefile
 src/Makefile
 src/port/Makefile
+src/helpers/Makefile
 src/tests/Makefile
 plugins/Makefile
 uml290/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 07255a3c8..f18b0ba6e 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -14,6 +14,8 @@ PLUGIN_COMMON_COMPILER_FLAGS = \
 	-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)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libmm-glib \
@@ -116,7 +118,7 @@ test_modem_helpers_icera_CPPFLAGS = \
 	$(PLUGIN_COMMON_COMPILER_FLAGS)
 test_modem_helpers_icera_LDADD = \
        $(top_builddir)/libmm-glib/libmm-glib.la \
-       $(top_builddir)/src/libmodem-helpers.la
+       $(top_builddir)/src/helpers/libhelpers.la
 test_modem_helpers_icera_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 ########################################
@@ -203,7 +205,7 @@ test_modem_helpers_huawei_CPPFLAGS = \
 	$(PLUGIN_COMMON_COMPILER_FLAGS)
 test_modem_helpers_huawei_LDADD = \
        $(top_builddir)/libmm-glib/libmm-glib.la \
-       $(top_builddir)/src/libmodem-helpers.la
+       $(top_builddir)/src/helpers/libhelpers.la
 test_modem_helpers_huawei_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Common Mbm modem support library
@@ -243,7 +245,7 @@ test_modem_helpers_mbm_CPPFLAGS = \
 	$(PLUGIN_COMMON_COMPILER_FLAGS)
 test_modem_helpers_mbm_LDADD = \
        $(top_builddir)/libmm-glib/libmm-glib.la \
-       $(top_builddir)/src/libmodem-helpers.la
+       $(top_builddir)/src/helpers/libhelpers.la
 test_modem_helpers_mbm_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Option
@@ -447,7 +449,7 @@ test_modem_helpers_cinterion_CPPFLAGS = \
 	$(PLUGIN_COMMON_COMPILER_FLAGS)
 test_modem_helpers_cinterion_LDADD = \
        $(top_builddir)/libmm-glib/libmm-glib.la \
-       $(top_builddir)/src/libmodem-helpers.la
+       $(top_builddir)/src/helpers/libhelpers.la
 test_modem_helpers_cinterion_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Iridium modem
@@ -561,7 +563,7 @@ test_modem_helpers_telit_CPPFLAGS = \
 	$(PLUGIN_COMMON_COMPILER_FLAGS)
 test_modem_helpers_telit_LDADD = \
        $(top_builddir)/libmm-glib/libmm-glib.la \
-       $(top_builddir)/src/libmodem-helpers.la
+       $(top_builddir)/src/helpers/libhelpers.la
 test_modem_helpers_telit_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # MTK
diff --git a/src/Makefile.am b/src/Makefile.am
index c77602f91..a558dc1bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = port . tests
+SUBDIRS = port helpers . tests
 
 udevrulesdir = $(UDEV_BASE_DIR)/rules.d
 udevrules_DATA = \
@@ -12,50 +12,6 @@ udevrules_DATA = \
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
 
-noinst_LTLIBRARIES = libmodem-helpers.la
-
-libmodem_helpers_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
-
-libmodem_helpers_la_LIBADD = \
-	$(top_builddir)/libmm-glib/libmm-glib.la
-
-libmodem_helpers_la_SOURCES = \
-	mm-error-helpers.c \
-	mm-error-helpers.h \
-	mm-modem-helpers.c \
-	mm-modem-helpers.h \
-	mm-charsets.c \
-	mm-charsets.h \
-	mm-sms-part.h \
-	mm-sms-part.c \
-	mm-sms-part-3gpp.h \
-	mm-sms-part-3gpp.c \
-	mm-sms-part-cdma.h \
-	mm-sms-part-cdma.c
-
-# Additional QMI support in libmodem-helpers
-if WITH_QMI
-libmodem_helpers_la_SOURCES += \
-	mm-modem-helpers-qmi.c \
-	mm-modem-helpers-qmi.h
-libmodem_helpers_la_CPPFLAGS += $(QMI_CFLAGS)
-endif
-
-# Additional MBIM support in libmodem-helpers
-if WITH_MBIM
-libmodem_helpers_la_SOURCES += \
-	mm-modem-helpers-mbim.c \
-	mm-modem-helpers-mbim.h
-libmodem_helpers_la_CPPFLAGS += $(MBIM_CFLAGS)
-endif
-
 # Daemon specific enum types
 DAEMON_ENUMS = \
 	$(srcdir)/mm-base-bearer.h \
@@ -81,6 +37,8 @@ ModemManager_CPPFLAGS = \
 	$(GUDEV_CFLAGS) \
 	-I$(srcdir)/port \
 	-I$(builddir)/port \
+	-I$(srcdir)/helpers \
+	-I$(builddir)/helpers \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
@@ -95,7 +53,7 @@ ModemManager_CPPFLAGS = \
 ModemManager_LDADD = \
 	$(MM_LIBS) \
 	$(GUDEV_LIBS) \
-	$(builddir)/libmodem-helpers.la \
+	$(builddir)/helpers/libhelpers.la \
 	$(builddir)/port/libport.la \
 	$(top_builddir)/libqcdm/src/libqcdm.la \
 	$(top_builddir)/libmm-glib/generated/tests/libmm-test-generated.la
@@ -110,7 +68,6 @@ ModemManager_SOURCES = \
 	mm-context.c \
 	mm-log.c \
 	mm-log.h \
-	mm-utils.h \
 	mm-private-boxed-types.h \
 	mm-private-boxed-types.c \
 	mm-auth.h \
diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
new file mode 100644
index 000000000..7a48102e2
--- /dev/null
+++ b/src/helpers/Makefile.am
@@ -0,0 +1,50 @@
+
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+
+noinst_LTLIBRARIES = libhelpers.la
+
+libhelpers_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
+
+libhelpers_la_LIBADD = \
+	$(top_builddir)/libmm-glib/libmm-glib.la
+
+libhelpers_la_SOURCES = \
+	mm-utils.h \
+	mm-error-helpers.c \
+	mm-error-helpers.h \
+	mm-modem-helpers.c \
+	mm-modem-helpers.h \
+	mm-charsets.c \
+	mm-charsets.h \
+	mm-sms-part.h \
+	mm-sms-part.c \
+	mm-sms-part-3gpp.h \
+	mm-sms-part-3gpp.c \
+	mm-sms-part-cdma.h \
+	mm-sms-part-cdma.c
+
+# Additional QMI support
+if WITH_QMI
+libhelpers_la_SOURCES += \
+	mm-modem-helpers-qmi.c \
+	mm-modem-helpers-qmi.h
+libhelpers_la_CPPFLAGS += $(QMI_CFLAGS)
+endif
+
+# Additional MBIM support
+if WITH_MBIM
+libhelpers_la_SOURCES += \
+	mm-modem-helpers-mbim.c \
+	mm-modem-helpers-mbim.h
+libhelpers_la_CPPFLAGS += $(MBIM_CFLAGS)
+endif
diff --git a/src/mm-charsets.c b/src/helpers/mm-charsets.c
index ffdcad52d..ffdcad52d 100644
--- a/src/mm-charsets.c
+++ b/src/helpers/mm-charsets.c
diff --git a/src/mm-charsets.h b/src/helpers/mm-charsets.h
index a85f3dc70..a85f3dc70 100644
--- a/src/mm-charsets.h
+++ b/src/helpers/mm-charsets.h
diff --git a/src/mm-error-helpers.c b/src/helpers/mm-error-helpers.c
index e922cbbfd..e922cbbfd 100644
--- a/src/mm-error-helpers.c
+++ b/src/helpers/mm-error-helpers.c
diff --git a/src/mm-error-helpers.h b/src/helpers/mm-error-helpers.h
index 379afb241..379afb241 100644
--- a/src/mm-error-helpers.h
+++ b/src/helpers/mm-error-helpers.h
diff --git a/src/mm-modem-helpers-mbim.c b/src/helpers/mm-modem-helpers-mbim.c
index 36d55023b..36d55023b 100644
--- a/src/mm-modem-helpers-mbim.c
+++ b/src/helpers/mm-modem-helpers-mbim.c
diff --git a/src/mm-modem-helpers-mbim.h b/src/helpers/mm-modem-helpers-mbim.h
index 67b6b57f0..67b6b57f0 100644
--- a/src/mm-modem-helpers-mbim.h
+++ b/src/helpers/mm-modem-helpers-mbim.h
diff --git a/src/mm-modem-helpers-qmi.c b/src/helpers/mm-modem-helpers-qmi.c
index 778ce9e73..778ce9e73 100644
--- a/src/mm-modem-helpers-qmi.c
+++ b/src/helpers/mm-modem-helpers-qmi.c
diff --git a/src/mm-modem-helpers-qmi.h b/src/helpers/mm-modem-helpers-qmi.h
index a19851fd9..a19851fd9 100644
--- a/src/mm-modem-helpers-qmi.h
+++ b/src/helpers/mm-modem-helpers-qmi.h
diff --git a/src/mm-modem-helpers.c b/src/helpers/mm-modem-helpers.c
index 17ad8d28c..17ad8d28c 100644
--- a/src/mm-modem-helpers.c
+++ b/src/helpers/mm-modem-helpers.c
diff --git a/src/mm-modem-helpers.h b/src/helpers/mm-modem-helpers.h
index 3be7c7be5..3be7c7be5 100644
--- a/src/mm-modem-helpers.h
+++ b/src/helpers/mm-modem-helpers.h
diff --git a/src/mm-sms-part-3gpp.c b/src/helpers/mm-sms-part-3gpp.c
index b305be591..b305be591 100644
--- a/src/mm-sms-part-3gpp.c
+++ b/src/helpers/mm-sms-part-3gpp.c
diff --git a/src/mm-sms-part-3gpp.h b/src/helpers/mm-sms-part-3gpp.h
index a21d73476..a21d73476 100644
--- a/src/mm-sms-part-3gpp.h
+++ b/src/helpers/mm-sms-part-3gpp.h
diff --git a/src/mm-sms-part-cdma.c b/src/helpers/mm-sms-part-cdma.c
index 3aa6b4554..3aa6b4554 100644
--- a/src/mm-sms-part-cdma.c
+++ b/src/helpers/mm-sms-part-cdma.c
diff --git a/src/mm-sms-part-cdma.h b/src/helpers/mm-sms-part-cdma.h
index 14c2c1df7..14c2c1df7 100644
--- a/src/mm-sms-part-cdma.h
+++ b/src/helpers/mm-sms-part-cdma.h
diff --git a/src/mm-sms-part.c b/src/helpers/mm-sms-part.c
index 9aafcc367..9aafcc367 100644
--- a/src/mm-sms-part.c
+++ b/src/helpers/mm-sms-part.c
diff --git a/src/mm-sms-part.h b/src/helpers/mm-sms-part.h
index 96262956f..96262956f 100644
--- a/src/mm-sms-part.h
+++ b/src/helpers/mm-sms-part.h
diff --git a/src/mm-utils.h b/src/helpers/mm-utils.h
index 2b0a9340b..2b0a9340b 100644
--- a/src/mm-utils.h
+++ b/src/helpers/mm-utils.h
diff --git a/src/port/Makefile.am b/src/port/Makefile.am
index 145692cce..c7e0c0e6a 100644
--- a/src/port/Makefile.am
+++ b/src/port/Makefile.am
@@ -29,6 +29,8 @@ libport_la_CPPFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
+	-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
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 1dfe80cfd..44acd256c 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -28,12 +28,14 @@ test_modem_helpers_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
+	-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
 
 test_modem_helpers_LDADD = \
-	$(top_builddir)/src/libmodem-helpers.la \
+	$(top_builddir)/src/helpers/libhelpers.la \
 	$(MM_LIBS)
 
 if WITH_QMI
@@ -53,13 +55,15 @@ test_modem_helpers_qmi_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
+	-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)
 
 test_modem_helpers_qmi_LDADD = \
-	$(top_builddir)/src/libmodem-helpers.la \
+	$(top_builddir)/src/helpers/libhelpers.la \
 	$(MM_LIBS) \
 	$(QMI_LIBS)
 endif
@@ -75,12 +79,14 @@ test_charsets_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
+	-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
 
 test_charsets_LDADD = \
-	$(top_builddir)/src/libmodem-helpers.la \
+	$(top_builddir)/src/helpers/libhelpers.la \
 	$(MM_LIBS)
 
 if WITH_QMI
@@ -109,7 +115,7 @@ test_qcdm_serial_port_CPPFLAGS = \
 test_qcdm_serial_port_LDADD = \
 	$(MM_LIBS) \
 	$(top_builddir)/src/port/libport.la \
-	$(top_builddir)/src/libmodem-helpers.la \
+	$(top_builddir)/src/helpers/libhelpers.la \
 	$(top_builddir)/libqcdm/src/libqcdm.la \
 	-lutil
 
@@ -139,7 +145,7 @@ test_at_serial_port_CPPFLAGS = \
 test_at_serial_port_LDADD = \
 	$(MM_LIBS) \
 	$(top_builddir)/src/port/libport.la \
-	$(top_builddir)/src/libmodem-helpers.la \
+	$(top_builddir)/src/helpers/libhelpers.la \
 	-lutil
 
 if WITH_QMI
@@ -158,12 +164,14 @@ test_sms_part_3gpp_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
+	-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
 
 test_sms_part_3gpp_LDADD = \
-	$(top_builddir)/src/libmodem-helpers.la \
+	$(top_builddir)/src/helpers/libhelpers.la \
 	$(MM_LIBS)
 
 if WITH_QMI
@@ -182,12 +190,14 @@ test_sms_part_cdma_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
+	-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
 
 test_sms_part_cdma_LDADD = \
-	$(top_builddir)/src/libmodem-helpers.la \
+	$(top_builddir)/src/helpers/libhelpers.la \
 	$(MM_LIBS)
 
 if WITH_QMI
diff --git a/test/Makefile.am b/test/Makefile.am
index 1711707a4..49fea1056 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,7 +21,7 @@ mmtty_CPPFLAGS = \
 mmtty_LDADD = \
 	$(MM_LIBS) \
 	$(top_builddir)/src/port/libport.la \
-	$(top_builddir)/src/libmodem-helpers.la
+	$(top_builddir)/src/helpers/libhelpers.la
 
 EXTRA_DIST = \
 	mmcli-test-sms