From 239c56cf7fe42d37257fbcd1f1d0893498c6cd05 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Wed, 3 Oct 2012 17:49:03 +0200
Subject: [PATCH] libmm-glib: don't install the common helpers header

And make it only available for internal ModemManager compilation.
---
 docs/reference/libmm-glib/Makefile.am         |  1 +
 .../libmm-glib/libmm-glib-sections.txt        | 37 -------------------
 libmm-glib/Makefile.am                        |  1 -
 libmm-glib/libmm-glib.h                       |  8 +++-
 libmm-glib/tests/Makefile.am                  |  3 +-
 5 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/docs/reference/libmm-glib/Makefile.am b/docs/reference/libmm-glib/Makefile.am
index be259b46..ce841387 100644
--- a/docs/reference/libmm-glib/Makefile.am
+++ b/docs/reference/libmm-glib/Makefile.am
@@ -21,6 +21,7 @@ CFILE_GLOB =
 # Headers to ignore
 IGNORE_HFILES = \
 	mm-helpers.h \
+	mm-common-helpers.h \
 	$(NULL)
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
diff --git a/docs/reference/libmm-glib/libmm-glib-sections.txt b/docs/reference/libmm-glib/libmm-glib-sections.txt
index 4e171165..20ca41e7 100644
--- a/docs/reference/libmm-glib/libmm-glib-sections.txt
+++ b/docs/reference/libmm-glib/libmm-glib-sections.txt
@@ -903,43 +903,6 @@ MM_TYPE_SMS_PROPERTIES
 mm_sms_properties_get_type
 </SECTION>
 
-<SECTION>
-<FILE>mm-common-helpers</FILE>
-MMParseKeyValueForeachFn
-mm_common_bands_array_to_variant
-mm_common_bands_garray_cmp
-mm_common_bands_garray_to_variant
-mm_common_bands_variant_to_array
-mm_common_bands_variant_to_garray
-mm_common_build_bands_any
-mm_common_build_bands_string
-mm_common_build_bands_unknown
-mm_common_build_sms_storages_string
-mm_common_get_bands_from_string
-mm_common_get_boolean_from_string
-mm_common_get_ip_type_from_string
-mm_common_get_modes_from_string
-mm_common_get_rm_protocol_from_string
-mm_common_get_sms_storage_from_string
-mm_common_parse_key_value_string
-mm_common_sms_storages_array_to_variant
-mm_common_sms_storages_garray_to_variant
-mm_common_sms_storages_variant_to_array
-mm_common_sms_storages_variant_to_garray
-mm_get_double_from_match_info
-mm_get_double_from_str
-mm_get_int_from_match_info
-mm_get_int_from_str
-mm_get_string_unquoted_from_match_info
-mm_get_uint_from_match_info
-mm_get_uint_from_str
-mm_sms_delivery_state_get_string_extended
-mm_utils_bin2hexstr
-mm_utils_check_for_single_value
-mm_utils_hex2byte
-mm_utils_hexstr2bin
-</SECTION>
-
 <SECTION>
 <FILE>mm-enums-types</FILE>
 IS_ENUM
diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am
index df90997e..abf2b000 100644
--- a/libmm-glib/Makefile.am
+++ b/libmm-glib/Makefile.am
@@ -92,7 +92,6 @@ include_HEADERS = \
 	mm-sim.h \
 	mm-sms.h \
 	mm-bearer.h \
-	mm-common-helpers.h \
 	mm-simple-status.h \
 	mm-simple-connect-properties.h \
 	mm-bearer-properties.h \
diff --git a/libmm-glib/libmm-glib.h b/libmm-glib/libmm-glib.h
index ef4409aa..79ee3102 100644
--- a/libmm-glib/libmm-glib.h
+++ b/libmm-glib/libmm-glib.h
@@ -45,7 +45,13 @@
 # include <mm-modem-firmware.h>
 #endif
 
-#include <mm-common-helpers.h>
+#if defined (_LIBMM_INSIDE_MM) ||    \
+    defined (_LIBMM_INSIDE_MMCLI) || \
+    defined (LIBMM_GLIB_COMPILATION)
+/* This one is not even installed */
+# include <mm-common-helpers.h>
+#endif
+
 #include <mm-simple-status.h>
 #include <mm-simple-connect-properties.h>
 #include <mm-sms-properties.h>
diff --git a/libmm-glib/tests/Makefile.am b/libmm-glib/tests/Makefile.am
index 2f6da036..92c77d86 100644
--- a/libmm-glib/tests/Makefile.am
+++ b/libmm-glib/tests/Makefile.am
@@ -13,7 +13,8 @@ test_common_helpers_CPPFLAGS = \
 	-I$(top_srcdir)/libmm-glib \
 	-I$(top_builddir)/libmm-glib \
 	-I${top_srcdir}/libmm-glib/generated \
-	-I${top_builddir}/libmm-glib/generated
+	-I${top_builddir}/libmm-glib/generated \
+	-DLIBMM_GLIB_COMPILATION
 
 test_common_helpers_LDADD = \
 	$(top_builddir)/libmm-glib/libmm-glib.la \