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.

15 files changed, 16 insertions, 0 deletions

diff --git a/cli/mmcli-bearer.c b/cli/mmcli-bearer.c
index e7aa6e79..0da8f5b2 100644
--- a/cli/mmcli-bearer.c
+++ b/cli/mmcli-bearer.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-common.c b/cli/mmcli-common.c
index 57a43a6a..103ee35e 100644
--- a/cli/mmcli-common.c
+++ b/cli/mmcli-common.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli-common.h"
diff --git a/cli/mmcli-common.h b/cli/mmcli-common.h
index 6d7b3ba7..615f5218 100644
--- a/cli/mmcli-common.h
+++ b/cli/mmcli-common.h
@@ -17,6 +17,8 @@
 #define _MMCLI_COMMON_H_
 
 #include <gio/gio.h>
+
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 void       mmcli_get_manager        (GDBusConnection *connection,
diff --git a/cli/mmcli-manager.c b/cli/mmcli-manager.c
index 70a7050e..d3bd48e7 100644
--- a/cli/mmcli-manager.c
+++ b/cli/mmcli-manager.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include "libmm-glib.h"
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-3gpp.c b/cli/mmcli-modem-3gpp.c
index 6d7be868..f88ce625 100644
--- a/cli/mmcli-modem-3gpp.c
+++ b/cli/mmcli-modem-3gpp.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-cdma.c b/cli/mmcli-modem-cdma.c
index b5183462..8841f7e8 100644
--- a/cli/mmcli-modem-cdma.c
+++ b/cli/mmcli-modem-cdma.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-firmware.c b/cli/mmcli-modem-firmware.c
index e12a3359..52f5c0d9 100644
--- a/cli/mmcli-modem-firmware.c
+++ b/cli/mmcli-modem-firmware.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-location.c b/cli/mmcli-modem-location.c
index 0b83a419..d96aabae 100644
--- a/cli/mmcli-modem-location.c
+++ b/cli/mmcli-modem-location.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-messaging.c b/cli/mmcli-modem-messaging.c
index bd02b7e0..604bf904 100644
--- a/cli/mmcli-modem-messaging.c
+++ b/cli/mmcli-modem-messaging.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-simple.c b/cli/mmcli-modem-simple.c
index b961a6e2..a8ef711d 100644
--- a/cli/mmcli-modem-simple.c
+++ b/cli/mmcli-modem-simple.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-time.c b/cli/mmcli-modem-time.c
index 6918833c..8dde6f4f 100644
--- a/cli/mmcli-modem-time.c
+++ b/cli/mmcli-modem-time.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem.c b/cli/mmcli-modem.c
index 9ec17a15..bcce2639 100644
--- a/cli/mmcli-modem.c
+++ b/cli/mmcli-modem.c
@@ -27,6 +27,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-sim.c b/cli/mmcli-sim.c
index 1bde2b74..085f3355 100644
--- a/cli/mmcli-sim.c
+++ b/cli/mmcli-sim.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-sms.c b/cli/mmcli-sms.c
index 798c2538..8520d50e 100644
--- a/cli/mmcli-sms.c
+++ b/cli/mmcli-sms.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli.c b/cli/mmcli.c
index 8e81452f..da68780f 100644
--- a/cli/mmcli.c
+++ b/cli/mmcli.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"