Force to only include <champlain/champlain.h>

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 518cf652e038bed9b6447421381e1f5f101f48b8..38d7ef5216a8550adaebb06f2fcdcc3812af43a4 100644 (file)
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -53,7 +53,7 @@ libchamplain_include_HEADERS = champlain.h champlainview.h champlaindefines.h ch
 
 libchamplain_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 
-AM_CPPFLAGS = $(DEPS_CFLAGS) -DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/tidy -I$(top_srcdir)
+AM_CPPFLAGS = $(DEPS_CFLAGS) -DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/tidy -I$(top_srcdir) -DCHAMPLAIN_COMPILATION
 AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*
 
 svgdir = $(datadir)/champlain

diff --git a/champlain/champlain.h b/champlain/champlain.h
index cdaf714023e88fbc825121a5b47d1c7a0f66d642..4acdb2bba9c358edd639c764d28b411e36db0422 100644 (file)
--- a/champlain/champlain.h
+++ b/champlain/champlain.h
@@ -19,6 +19,8 @@
 #ifndef CHAMPLAIN_H
 #define CHAMPLAIN_H
 
+#define __CHAMPLAIN_CHAMPLAIN_H_INSIDE__
+
 #define CHAMPLAIN_MIN_LAT -90
 #define CHAMPLAIN_MAX_LAT 90
 #define CHAMPLAIN_MIN_LONG -180
@@ -31,4 +33,6 @@
 #include <champlain/champlainmarker.h>
 #include <champlain/champlainlayer.h>
 
+#undef __CHAMPLAIN_CHAMPLAIN_H_INSIDE__
+
 #endif

diff --git a/champlain/champlaindefines.h b/champlain/champlaindefines.h
index c0f6533adf6b70ef77b9510a6c73a43f9b0a9ede..9c3ea97a22c0d1fc8923a5cd4333a5005ea242fa 100644 (file)
--- a/champlain/champlaindefines.h
+++ b/champlain/champlaindefines.h
@@ -16,6 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#if !defined (__CHAMPLAIN_CHAMPLAIN_H_INSIDE__) && !defined (CHAMPLAIN_COMPILATION)
+#error "Only <champlain/champlain.h> can be included directly."
+#endif
+
 #ifndef CHAMPLAIN_DEFINES_H
 #define CHAMPLAIN_DEFINES_H
 

diff --git a/champlain/champlainlayer.h b/champlain/champlainlayer.h
index 99c4a9170ae4edf04ee39e242f9074767d9d0498..f22e4b39a97d4e8b1f5ddc4b5b9df15362465f35 100644 (file)
--- a/champlain/champlainlayer.h
+++ b/champlain/champlainlayer.h
@@ -16,6 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#if !defined (__CHAMPLAIN_CHAMPLAIN_H_INSIDE__) && !defined (CHAMPLAIN_COMPILATION)
+#error "Only <champlain/champlain.h> can be included directly."
+#endif
+
 #ifndef CHAMPLAIN_LAYER_H
 #define CHAMPLAIN_LAYER_H
 

diff --git a/champlain/champlainmarker.h b/champlain/champlainmarker.h
index badb41d3b4ce09ba378ac310cd9b23802f2c2fce..8853caf90e18eb85d0173ff4bc0ed58092590ed9 100644 (file)
--- a/champlain/champlainmarker.h
+++ b/champlain/champlainmarker.h
@@ -16,6 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#if !defined (__CHAMPLAIN_CHAMPLAIN_H_INSIDE__) && !defined (CHAMPLAIN_COMPILATION)
+#error "Only <champlain/champlain.h> can be included directly."
+#endif
+
 #ifndef CHAMPLAIN_MARKER_H
 #define CHAMPLAIN_MARKER_H
 

diff --git a/champlain/champlainview.h b/champlain/champlainview.h
index 581c1a80c0f5cf39b4863759b432e620f55e7b27..88810f2443a48e9a523aee67e8b2562a25d0d0d1 100644 (file)
--- a/champlain/champlainview.h
+++ b/champlain/champlainview.h
@@ -16,6 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#if !defined (__CHAMPLAIN_CHAMPLAIN_H_INSIDE__) && !defined (CHAMPLAIN_COMPILATION)
+#error "Only <champlain/champlain.h> can be included directly."
+#endif 
+
 #ifndef CHAMPLAIN_VIEW_H
 #define CHAMPLAIN_VIEW_H