From 4b409de5ba6b7cc181ccfb14d1a28d5076a4b65b Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 28 Apr 2011 13:03:21 +0900
Subject: [PATCH] Add guard to prevent individual headers from being included
 directly.

---
 eek/Makefile.am              | 10 +++++-----
 eek/eek-clutter-keyboard.h   |  5 +++++
 eek/eek-container.h          |  5 +++++
 eek/eek-element.h            |  5 +++++
 eek/eek-enumtypes.h.template |  5 +++++
 eek/eek-gtk-keyboard.h       |  5 +++++
 eek/eek-key.h                |  5 +++++
 eek/eek-keyboard.h           |  5 +++++
 eek/eek-keysym.h             |  5 +++++
 eek/eek-layout.h             |  4 ++++
 eek/eek-section.h            |  5 +++++
 eek/eek-serializable.h       |  4 ++++
 eek/eek-symbol.h             |  5 +++++
 eek/eek-theme.h              |  5 +++++
 eek/eek-types.h              |  5 +++++
 eek/eek-xkb-layout.h         |  5 +++++
 eek/eek-xkl-layout.h         |  5 +++++
 eek/eek-xml-layout.h         |  4 ++++
 eek/eek-xml.h                |  4 ++++
 eek/eek.h                    |  2 ++
 src/xml-main.c               |  2 +-
 tests/eek-xml-test.c         |  2 +-
 22 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/eek/Makefile.am b/eek/Makefile.am
index d789fe42..c1bd4af0 100644
--- a/eek/Makefile.am
+++ b/eek/Makefile.am
@@ -96,7 +96,7 @@ libeek_la_SOURCES =				\
 	$(srcdir)/eek-enumtypes.c		\
 	$(srcdir)/eek-marshalers.c
 
-libeek_la_CFLAGS = $(GIO2_CFLAGS) $(PANGOCAIRO_CFLAGS) $(LIBCROCO_CFLAGS)
+libeek_la_CFLAGS = -DEEK_COMPILATION=1 $(GIO2_CFLAGS) $(PANGOCAIRO_CFLAGS) $(LIBCROCO_CFLAGS)
 libeek_la_LIBADD = $(GIO2_LIBS) $(PANGOCAIRO_LIBS) $(LIBCROCO_LIBS) -lm
 
 if ENABLE_CLUTTER
@@ -116,7 +116,7 @@ libeek_clutter_sources =			\
 	$(srcdir)/eek-clutter-renderer.c
 
 libeek_clutter_la_SOURCES = $(libeek_clutter_sources)
-libeek_clutter_la_CFLAGS = $(CLUTTER_CFLAGS)
+libeek_clutter_la_CFLAGS = -DEEK_COMPILATION=1 $(CLUTTER_CFLAGS)
 libeek_clutter_la_LIBADD = libeek.la $(CLUTTER_LIBS)
 endif
 
@@ -130,7 +130,7 @@ libeek_gtk_sources =				\
 	$(srcdir)/eek-gtk-renderer.c
 
 libeek_gtk_la_SOURCES = $(libeek_gtk_sources)
-libeek_gtk_la_CFLAGS = $(GTK_CFLAGS)
+libeek_gtk_la_CFLAGS = -DEEK_COMPILATION=1 $(GTK_CFLAGS)
 libeek_gtk_la_LIBADD = libeek.la $(GTK_LIBS)
 
 libeek_xkb_public_headers =			\
@@ -141,7 +141,7 @@ libeek_xkb_sources =				\
 	$(srcdir)/eek-xkb-layout.c
 
 libeek_xkb_la_SOURCES = $(libeek_xkb_sources)
-libeek_xkb_la_CFLAGS = $(XKB_CFLAGS) $(GTK_CFLAGS)
+libeek_xkb_la_CFLAGS = -DEEK_COMPILATION=1 $(XKB_CFLAGS) $(GTK_CFLAGS)
 libeek_xkb_la_LIBADD = libeek.la $(XKB_LIBS) $(GTK_LIBS)
 
 libeek_xkl_public_headers =			\
@@ -152,7 +152,7 @@ libeek_xkl_sources =				\
 	$(srcdir)/eek-xkl-layout.c
 
 libeek_xkl_la_SOURCES = $(libeek_xkl_sources)
-libeek_xkl_la_CFLAGS = $(LIBXKLAVIER_CFLAGS) $(GTK_CFLAGS)
+libeek_xkl_la_CFLAGS = -DEEK_COMPILATION=1 $(LIBXKLAVIER_CFLAGS) $(GTK_CFLAGS)
 libeek_xkl_la_LIBADD = libeek-xkb.la $(LIBXKLAVIER_LIBS) $(GTK_LIBS)
 
 eekdir = $(includedir)/eek-$(EEK_API_VERSION)/eek
diff --git a/eek/eek-clutter-keyboard.h b/eek/eek-clutter-keyboard.h
index 1d5eae46..fd4f5bf3 100644
--- a/eek/eek-clutter-keyboard.h
+++ b/eek/eek-clutter-keyboard.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek-clutter.h> can be included directly."
+#endif
+
 #ifndef EEK_CLUTTER_KEYBOARD_H
 #define EEK_CLUTTER_KEYBOARD_H 1
 
diff --git a/eek/eek-container.h b/eek/eek-container.h
index 40f683ee..76602881 100644
--- a/eek/eek-container.h
+++ b/eek/eek-container.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_CONTAINER_H
 #define EEK_CONTAINER_H 1
 
diff --git a/eek/eek-element.h b/eek/eek-element.h
index df871d3c..993bfe40 100644
--- a/eek/eek-element.h
+++ b/eek/eek-element.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_ELEMENT_H
 #define EEK_ELEMENT_H 1
 
diff --git a/eek/eek-enumtypes.h.template b/eek/eek-enumtypes.h.template
index 568efaf4..9a9d33e8 100644
--- a/eek/eek-enumtypes.h.template
+++ b/eek/eek-enumtypes.h.template
@@ -1,4 +1,9 @@
 /*** BEGIN file-header ***/
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef __EEK_ENUMTYPES_H__
 #define __EEK_ENUMTYPES_H__
 
diff --git a/eek/eek-gtk-keyboard.h b/eek/eek-gtk-keyboard.h
index a0473878..46ea4db9 100644
--- a/eek/eek-gtk-keyboard.h
+++ b/eek/eek-gtk-keyboard.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek-gtk.h> can be included directly."
+#endif
+
 #ifndef EEK_GTK_KEYBOARD_H
 #define EEK_GTK_KEYBOARD_H 1
 
diff --git a/eek/eek-key.h b/eek/eek-key.h
index 3724cbaf..5be5aa8d 100644
--- a/eek/eek-key.h
+++ b/eek/eek-key.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_KEY_H
 #define EEK_KEY_H 1
 
diff --git a/eek/eek-keyboard.h b/eek/eek-keyboard.h
index faf1a8d4..265f9666 100644
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_KEYBOARD_H
 #define EEK_KEYBOARD_H 1
 
diff --git a/eek/eek-keysym.h b/eek/eek-keysym.h
index 795afbca..cfad4deb 100644
--- a/eek/eek-keysym.h
+++ b/eek/eek-keysym.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_KEYSYM_H
 #define EEK_KEYSYM_H 1
 
diff --git a/eek/eek-layout.h b/eek/eek-layout.h
index 7617afa8..80771775 100644
--- a/eek/eek-layout.h
+++ b/eek/eek-layout.h
@@ -18,6 +18,10 @@
  * 02110-1301 USA
  */
 
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_LAYOUT_H
 #define EEK_LAYOUT_H 1
 
diff --git a/eek/eek-section.h b/eek/eek-section.h
index 6add97c6..316be873 100644
--- a/eek/eek-section.h
+++ b/eek/eek-section.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_SECTION_H
 #define EEK_SECTION_H 1
 
diff --git a/eek/eek-serializable.h b/eek/eek-serializable.h
index 3a34b3fa..20950ce4 100644
--- a/eek/eek-serializable.h
+++ b/eek/eek-serializable.h
@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_SERIALIZABLE_H
 #define EEK_SERIALIZABLE_H 1
 
diff --git a/eek/eek-symbol.h b/eek/eek-symbol.h
index 6e5f01db..f1a5e619 100644
--- a/eek/eek-symbol.h
+++ b/eek/eek-symbol.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_SYMBOL_H
 #define EEK_SYMBOL_H 1
 
diff --git a/eek/eek-theme.h b/eek/eek-theme.h
index 031c8d7c..14fba423 100644
--- a/eek/eek-theme.h
+++ b/eek/eek-theme.h
@@ -1,4 +1,9 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef __EEK_THEME_H__
 #define __EEK_THEME_H__
 
diff --git a/eek/eek-types.h b/eek/eek-types.h
index 0ef1f33f..00f7dfe8 100644
--- a/eek/eek-types.h
+++ b/eek/eek-types.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_TYPES_H
 #define EEK_TYPES_H 1
 
diff --git a/eek/eek-xkb-layout.h b/eek/eek-xkb-layout.h
index f3617cf6..fe9dbb84 100644
--- a/eek/eek-xkb-layout.h
+++ b/eek/eek-xkb-layout.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek-xkb.h> can be included directly."
+#endif
+
 #ifndef EEK_XKB_LAYOUT_H
 #define EEK_XKB_LAYOUT_H 1
 
diff --git a/eek/eek-xkl-layout.h b/eek/eek-xkl-layout.h
index 0c5a2196..c402a2b8 100644
--- a/eek/eek-xkl-layout.h
+++ b/eek/eek-xkl-layout.h
@@ -17,6 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek-xkl.h> can be included directly."
+#endif
+
 #ifndef EEK_XKL_LAYOUT_H
 #define EEK_XKL_LAYOUT_H 1
 
diff --git a/eek/eek-xml-layout.h b/eek/eek-xml-layout.h
index 5f0c2e00..4fa64710 100644
--- a/eek/eek-xml-layout.h
+++ b/eek/eek-xml-layout.h
@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_XML_LAYOUT_H
 #define EEK_XML_LAYOUT_H 1
 
diff --git a/eek/eek-xml.h b/eek/eek-xml.h
index 4598d9b0..3c4deba2 100644
--- a/eek/eek-xml.h
+++ b/eek/eek-xml.h
@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_XML_H
 #define EEK_XML_H 1
 
diff --git a/eek/eek.h b/eek/eek.h
index 20e997e9..e7c5dec4 100644
--- a/eek/eek.h
+++ b/eek/eek.h
@@ -20,6 +20,8 @@
 #ifndef EEK_H
 #define EEK_H 1
 
+#define __EEK_H_INSIDE__ 1
+
 #include "eek-keyboard.h"
 #include "eek-section.h"
 #include "eek-key.h"
diff --git a/src/xml-main.c b/src/xml-main.c
index 0f6a7530..0fcdca2a 100644
--- a/src/xml-main.c
+++ b/src/xml-main.c
@@ -26,7 +26,7 @@
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 
-#include "eek/eek-xml.h"
+#include "eek/eek.h"
 #include "eek/eek-xkl.h"
 
 #if HAVE_CLUTTER_GTK
diff --git a/tests/eek-xml-test.c b/tests/eek-xml-test.c
index 0c21d9f7..49d7e059 100644
--- a/tests/eek-xml-test.c
+++ b/tests/eek-xml-test.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
-#include "eek/eek-xml.h"
+#include "eek/eek.h"
 #include "eek/eek-xkl.h"
 
 static void