libmm-glib: don't install the common helpers header

And make it only available for internal ModemManager compilation.
This commit is contained in:
Aleksander Morgado
2012-10-03 17:49:03 +02:00
parent b52bbf7b0b
commit 239c56cf7f
5 changed files with 10 additions and 40 deletions

View File

@@ -21,6 +21,7 @@ CFILE_GLOB =
# Headers to ignore # Headers to ignore
IGNORE_HFILES = \ IGNORE_HFILES = \
mm-helpers.h \ mm-helpers.h \
mm-common-helpers.h \
$(NULL) $(NULL)
# CFLAGS and LDFLAGS for compiling scan program. Only needed # CFLAGS and LDFLAGS for compiling scan program. Only needed

View File

@@ -903,43 +903,6 @@ MM_TYPE_SMS_PROPERTIES
mm_sms_properties_get_type mm_sms_properties_get_type
</SECTION> </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> <SECTION>
<FILE>mm-enums-types</FILE> <FILE>mm-enums-types</FILE>
IS_ENUM IS_ENUM

View File

@@ -92,7 +92,6 @@ include_HEADERS = \
mm-sim.h \ mm-sim.h \
mm-sms.h \ mm-sms.h \
mm-bearer.h \ mm-bearer.h \
mm-common-helpers.h \
mm-simple-status.h \ mm-simple-status.h \
mm-simple-connect-properties.h \ mm-simple-connect-properties.h \
mm-bearer-properties.h \ mm-bearer-properties.h \

View File

@@ -45,7 +45,13 @@
# include <mm-modem-firmware.h> # include <mm-modem-firmware.h>
#endif #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-status.h>
#include <mm-simple-connect-properties.h> #include <mm-simple-connect-properties.h>
#include <mm-sms-properties.h> #include <mm-sms-properties.h>

View File

@@ -13,7 +13,8 @@ test_common_helpers_CPPFLAGS = \
-I$(top_srcdir)/libmm-glib \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-glib \ -I$(top_builddir)/libmm-glib \
-I${top_srcdir}/libmm-glib/generated \ -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 = \ test_common_helpers_LDADD = \
$(top_builddir)/libmm-glib/libmm-glib.la \ $(top_builddir)/libmm-glib/libmm-glib.la \