From c250fa3797b40f70cbac1d9e417b1d3ad946ee89 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Wed, 3 Oct 2012 12:46:37 +0200
Subject: libmm-glib: remove the `libmm-common.h' header

Both the ModemManager daemon and the mmcli will now include `libmm-glib.h' only.

We also handle two new special `_LIBMM_INSIDE_MM' and `LIBMM_INSIDE_MMCLI'
symbols, which if included before the `libmm-glib.h' library allow us to:

 * Don't include the libmm-glib high level API in the ModemManager daemon, as
   the object names would clash with those in the core.

 * Define some of the methods of helper objects to be included only if compiling
   ModemManager daemon or the mmcli.
---
 libmm-glib/libmm-glib.h | 42 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

(limited to 'libmm-glib/libmm-glib.h')

diff --git a/libmm-glib/libmm-glib.h b/libmm-glib/libmm-glib.h
index 7b26d394..62401bb6 100644
--- a/libmm-glib/libmm-glib.h
+++ b/libmm-glib/libmm-glib.h
@@ -26,11 +26,43 @@
 /* ModemManager generic headers */
 #include <ModemManager.h>
 
-/* libmm-common specific headers */
-#include <libmm-common.h>
-
 /* libmm-glib headers */
-#include <mm-manager.h>
-#include <mm-object.h>
+
+#if !defined (_LIBMM_INSIDE_MM)
+/* This headers are not exported within ModemManager */
+# include <mm-manager.h>
+# include <mm-object.h>
+# include <mm-modem.h>
+# include <mm-modem-3gpp.h>
+# include <mm-modem-3gpp-ussd.h>
+# include <mm-modem-cdma.h>
+# include <mm-modem-simple.h>
+# include <mm-modem-location.h>
+# include <mm-modem-messaging.h>
+# include <mm-modem-time.h>
+# include <mm-modem-firmware.h>
+#endif
+
+#include <mm-common-helpers.h>
+#include <mm-simple-status.h>
+#include <mm-simple-connect-properties.h>
+#include <mm-sms-properties.h>
+#include <mm-bearer-properties.h>
+#include <mm-bearer-ip-config.h>
+#include <mm-location-3gpp.h>
+#include <mm-location-gps-raw.h>
+#include <mm-location-gps-nmea.h>
+#include <mm-unlock-retries.h>
+#include <mm-network-timezone.h>
+#include <mm-firmware-properties.h>
+
+/* generated */
+#include <mm-errors-types.h>
+#include <mm-enums-types.h>
+#include <mm-gdbus-manager.h>
+#include <mm-gdbus-modem.h>
+#include <mm-gdbus-bearer.h>
+#include <mm-gdbus-sim.h>
+#include <mm-gdbus-sms.h>
 
 #endif /* _LIBMM_GLIB_H_ */
-- 
cgit v1.2.3-70-g09d2