build,libqmi-glib: only allow including `libqmi-glib.h' directly

17 files changed, 87 insertions, 12 deletions

diff --git a/libqmi-glib/Makefile.am b/libqmi-glib/Makefile.am
index 73dd69f..d8ffc46 100644
--- a/libqmi-glib/Makefile.am
+++ b/libqmi-glib/Makefile.am
@@ -9,7 +9,8 @@ libqmi_glib_la_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/libqmi-glib \
 	-I$(top_srcdir)/libqmi-glib/generated \
-	-I$(top_builddir)/libqmi-glib/generated
+	-I$(top_builddir)/libqmi-glib/generated \
+	-DLIBQMI_GLIB_COMPILATION
 
 libqmi_glib_la_SOURCES = \
 	libqmi-glib.h \
@@ -40,6 +41,7 @@ include_HEADERS = \
 	qmi-enums-nas.h qmi-flags64-nas.h \
 	qmi-enums-wms.h \
 	qmi-enums-pds.h \
+	qmi-utils.h \
 	qmi-message.h \
 	qmi-device.h \
 	qmi-client.h
diff --git a/libqmi-glib/generated/Makefile.am b/libqmi-glib/generated/Makefile.am
index e73540a..d984ce8 100644
--- a/libqmi-glib/generated/Makefile.am
+++ b/libqmi-glib/generated/Makefile.am
@@ -175,7 +175,8 @@ nodist_libqmi_glib_generated_la_SOURCES = \
 libqmi_glib_generated_la_CPPFLAGS = \
 	$(LIBQMI_GLIB_CFLAGS) \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/libqmi-glib
+	-I$(top_srcdir)/libqmi-glib \
+	-DLIBQMI_GLIB_COMPILATION
 
 libqmi_glib_generated_la_LIBADD = \
 	$(LIBQMI_GLIB_LIBS)
@@ -185,7 +186,6 @@ nodist_include_HEADERS = \
 	qmi-error-types.h \
 	qmi-enum-types.h \
 	qmi-flags64-types.h \
-	qmi-ctl.h \
 	qmi-dms.h \
 	qmi-nas.h \
 	qmi-wds.h \
diff --git a/libqmi-glib/libqmi-glib.h b/libqmi-glib/libqmi-glib.h
index 23b9738..bfdad67 100644
--- a/libqmi-glib/libqmi-glib.h
+++ b/libqmi-glib/libqmi-glib.h
@@ -18,21 +18,42 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2012 Aleksander Morgado <aleksander@lanedo.com>
+ * Copyright (C) 2012 Google, Inc.
  */
 
 #ifndef _LIBQMI_GLIB_H_
 #define _LIBQMI_GLIB_H_
 
-#include "qmi-error-types.h"
-#include "qmi-enum-types.h"
-#include "qmi-flags64-types.h"
+#define __LIBQMI_GLIB_H_INSIDE__
+
+/* libqmi-glib headers */
 
 #include "qmi-device.h"
 #include "qmi-client.h"
+#include "qmi-message.h"
+#include "qmi-enums.h"
+#include "qmi-utils.h"
+
+#include "qmi-enums-dms.h"
+#include "qmi-flags64-dms.h"
 #include "qmi-dms.h"
-#include "qmi-wds.h"
+
+#include "qmi-flags64-nas.h"
+#include "qmi-enums-nas.h"
 #include "qmi-nas.h"
+
+#include "qmi-enums-wds.h"
+#include "qmi-wds.h"
+
+#include "qmi-enums-wms.h"
 #include "qmi-wms.h"
+
+#include "qmi-enums-pds.h"
 #include "qmi-pds.h"
 
+/* generated */
+#include "qmi-error-types.h"
+#include "qmi-enum-types.h"
+#include "qmi-flags64-types.h"
+
 #endif /* _LIBQMI_GLIB_H_ */
diff --git a/libqmi-glib/qmi-client.h b/libqmi-glib/qmi-client.h
index d9c5991..1305f15 100644
--- a/libqmi-glib/qmi-client.h
+++ b/libqmi-glib/qmi-client.h
@@ -23,6 +23,10 @@
 #ifndef _LIBQMI_GLIB_QMI_CLIENT_H_
 #define _LIBQMI_GLIB_QMI_CLIENT_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 #include "qmi-enums.h"
diff --git a/libqmi-glib/qmi-device.h b/libqmi-glib/qmi-device.h
index 37e14e3..f43a73f 100644
--- a/libqmi-glib/qmi-device.h
+++ b/libqmi-glib/qmi-device.h
@@ -23,6 +23,10 @@
 #ifndef _LIBQMI_GLIB_QMI_DEVICE_H_
 #define _LIBQMI_GLIB_QMI_DEVICE_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <gio/gio.h>
 
diff --git a/libqmi-glib/qmi-enums-dms.h b/libqmi-glib/qmi-enums-dms.h
index 1c96dfe..d5d83f3 100644
--- a/libqmi-glib/qmi-enums-dms.h
+++ b/libqmi-glib/qmi-enums-dms.h
@@ -23,7 +23,9 @@
 #ifndef _LIBQMI_GLIB_QMI_ENUMS_DMS_H_
 #define _LIBQMI_GLIB_QMI_ENUMS_DMS_H_
 
-#include <glib.h>
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
 
 /*****************************************************************************/
 /* Helper enums for the 'QMI DMS Get Capabilities' message */
diff --git a/libqmi-glib/qmi-enums-nas.h b/libqmi-glib/qmi-enums-nas.h
index 73a50bb..7d7055d 100644
--- a/libqmi-glib/qmi-enums-nas.h
+++ b/libqmi-glib/qmi-enums-nas.h
@@ -23,6 +23,10 @@
 #ifndef _LIBQMI_GLIB_QMI_ENUMS_NAS_H_
 #define _LIBQMI_GLIB_QMI_ENUMS_NAS_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 /*****************************************************************************/
 /* Helper enums for the 'QMI NAS Event Report' indication */
 
diff --git a/libqmi-glib/qmi-enums-pds.h b/libqmi-glib/qmi-enums-pds.h
index bed6b26..8a64910 100644
--- a/libqmi-glib/qmi-enums-pds.h
+++ b/libqmi-glib/qmi-enums-pds.h
@@ -23,6 +23,10 @@
 #ifndef _LIBQMI_GLIB_QMI_ENUMS_PDS_H_
 #define _LIBQMI_GLIB_QMI_ENUMS_PDS_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 /*****************************************************************************/
 /* Helper enums for the 'QMI PDS Event Report' indication */
 
diff --git a/libqmi-glib/qmi-enums-wds.h b/libqmi-glib/qmi-enums-wds.h
index 335e36a..0c419aa 100644
--- a/libqmi-glib/qmi-enums-wds.h
+++ b/libqmi-glib/qmi-enums-wds.h
@@ -23,6 +23,10 @@
 #ifndef _LIBQMI_GLIB_QMI_ENUMS_WDS_H_
 #define _LIBQMI_GLIB_QMI_ENUMS_WDS_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 /*****************************************************************************/
diff --git a/libqmi-glib/qmi-enums-wms.h b/libqmi-glib/qmi-enums-wms.h
index 9248746..12637cf 100644
--- a/libqmi-glib/qmi-enums-wms.h
+++ b/libqmi-glib/qmi-enums-wms.h
@@ -23,6 +23,10 @@
 #ifndef _LIBQMI_GLIB_QMI_ENUMS_WMS_H_
 #define _LIBQMI_GLIB_QMI_ENUMS_WMS_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 /*****************************************************************************/
 /* Helper enums for the 'QMI WMS Event Report' indication */
 
diff --git a/libqmi-glib/qmi-enums.h b/libqmi-glib/qmi-enums.h
index cfb5b1e..d16f1cc 100644
--- a/libqmi-glib/qmi-enums.h
+++ b/libqmi-glib/qmi-enums.h
@@ -23,6 +23,10 @@
 #ifndef _LIBQMI_GLIB_QMI_ENUMS_H_
 #define _LIBQMI_GLIB_QMI_ENUMS_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 /**
  * QmiService:
  * @QMI_SERVICE_UNKNOWN: Unknown service.
diff --git a/libqmi-glib/qmi-errors.h b/libqmi-glib/qmi-errors.h
index 5ee3fc0..9dcb9ff 100644
--- a/libqmi-glib/qmi-errors.h
+++ b/libqmi-glib/qmi-errors.h
@@ -23,6 +23,10 @@
 #ifndef _LIBQMI_GLIB_QMI_ERRORS_H_
 #define _LIBQMI_GLIB_QMI_ERRORS_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 /* Prefixes for errors registered in DBus */
 #define QMI_DBUS_ERROR_PREFIX          "org.freedesktop.libqmi.Error"
 #define QMI_CORE_ERROR_DBUS_PREFIX     QMI_DBUS_ERROR_PREFIX ".Core"
diff --git a/libqmi-glib/qmi-flags64-dms.h b/libqmi-glib/qmi-flags64-dms.h
index e8554b0..23dd67c 100644
--- a/libqmi-glib/qmi-flags64-dms.h
+++ b/libqmi-glib/qmi-flags64-dms.h
@@ -24,6 +24,10 @@
 #ifndef _LIBQMI_GLIB_QMI_FLAGS64_DMS_H_
 #define _LIBQMI_GLIB_QMI_FLAGS64_DMS_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 /*****************************************************************************/
diff --git a/libqmi-glib/qmi-flags64-nas.h b/libqmi-glib/qmi-flags64-nas.h
index 9897aa7..b76f8f2 100644
--- a/libqmi-glib/qmi-flags64-nas.h
+++ b/libqmi-glib/qmi-flags64-nas.h
@@ -23,6 +23,12 @@
 #ifndef _LIBQMI_GLIB_QMI_FLAGS64_NAS_H_
 #define _LIBQMI_GLIB_QMI_FLAGS64_NAS_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
+#include <glib.h>
+
 /*****************************************************************************/
 /* Helper enums for the 'QMI NAS Get System Selection Preference'
  * request/response */
diff --git a/libqmi-glib/qmi-message.h b/libqmi-glib/qmi-message.h
index 6b25c31..ae88671 100644
--- a/libqmi-glib/qmi-message.h
+++ b/libqmi-glib/qmi-message.h
@@ -30,6 +30,10 @@
 #ifndef _LIBQMI_GLIB_QMI_MESSAGE_H_
 #define _LIBQMI_GLIB_QMI_MESSAGE_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 #include "qmi-enums.h"
diff --git a/libqmi-glib/qmi-utils.h b/libqmi-glib/qmi-utils.h
index 87d69dd..dc2d654 100644
--- a/libqmi-glib/qmi-utils.h
+++ b/libqmi-glib/qmi-utils.h
@@ -21,11 +21,13 @@
  * Copyright (C) 2012 Aleksander Morgado <aleksander@lanedo.com>
  */
 
-/* NOTE: this is a private non-installable header */
-
 #ifndef _LIBQMI_GLIB_QMI_UTILS_H_
 #define _LIBQMI_GLIB_QMI_UTILS_H_
 
+#if !defined (__LIBQMI_GLIB_H_INSIDE__) && !defined (LIBQMI_GLIB_COMPILATION)
+#error "Only <libqmi-glib.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/libqmi-glib/test/Makefile.am b/libqmi-glib/test/Makefile.am
index a93bdee..d788ceb 100644
--- a/libqmi-glib/test/Makefile.am
+++ b/libqmi-glib/test/Makefile.am
@@ -10,7 +10,8 @@ test_utils_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libqmi-glib \
 	-I$(top_srcdir)/libqmi-glib/generated \
-	-I$(top_builddir)/libqmi-glib/generated
+	-I$(top_builddir)/libqmi-glib/generated \
+	-DLIBQMI_GLIB_COMPILATION
 test_utils_LDADD = \
 	$(top_builddir)/libqmi-glib/libqmi-glib.la \
 	$(LIBQMI_GLIB_LIBS)
@@ -22,7 +23,8 @@ test_message_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libqmi-glib \
 	-I$(top_srcdir)/libqmi-glib/generated \
-	-I$(top_builddir)/libqmi-glib/generated
+	-I$(top_builddir)/libqmi-glib/generated \
+	-DLIBQMI_GLIB_COMPILATION
 test_message_LDADD = \
 	$(top_builddir)/libqmi-glib/libqmi-glib.la \
 	$(LIBQMI_GLIB_LIBS)