Force use of <champlain-gtk/champlain-gtk.h>

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 5082e120d6553ec32732aafc0499c9148d857309..9b754250d74acdef1ac1e1e878a16e91a2a986ed 100644 (file)
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -29,7 +29,7 @@ libchamplain_include_HEADERS = champlainviewembed.h
 
 libchamplain_gtk_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 
-AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
 AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*
 
 EXTRA_DIST = $(CHAMPLAIN_GTK_MARSHAL_LIST)

diff --git a/champlain-gtk/champlain-gtk.h b/champlain-gtk/champlain-gtk.h
new file mode 100644 (file)
index 0000000..e54b847
--- /dev/null
+++ b/champlain-gtk/champlain-gtk.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2008 Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef CHAMPLAIN_GTK_H
+#define CHAMPLAIN_GTK_H
+
+#define __CHAMPLAIN_GTK_CHAMPLAIN_GTK_H_INSIDE__
+
+#include <champlain-gtk/champlainviewembed.h>
+
+#undef __CHAMPLAIN_GTK_CHAMPLAIN_GTK_H_INSIDE__
+
+#endif

diff --git a/champlain-gtk/champlainviewembed.h b/champlain-gtk/champlainviewembed.h
index c8978738e331526bf14c7e661035b141b1525a40..7eeb35cfa4e800a6073b38e9c3bae9206c3397aa 100644 (file)
--- a/champlain-gtk/champlainviewembed.h
+++ b/champlain-gtk/champlainviewembed.h
@@ -15,6 +15,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+ 
+#if !defined (__CHAMPLAIN_GTK_CHAMPLAIN_GTK_H_INSIDE__) && !defined (CHAMPLAIN_GTK_COMPILATION)
+#error "Only <champlain/champlain.h> can be included directly."
+#endif
 
 #ifndef CHAMPLAIN_VIEW_EMBED_H
 #define CHAMPLAIN_VIEW_EMBED_H

diff --git a/demos/launcher.c b/demos/launcher.c
index d85fe5f975d3d4561b81f1f23b3b8e34862b88bf..bd88c60f16699e193ec7344fa4b754d05095bc4b 100644 (file)
--- a/demos/launcher.c
+++ b/demos/launcher.c
@@ -21,7 +21,7 @@
 #include <gtk/gtk.h>
 
 #include <champlain/champlain.h>
-#include <champlain-gtk/champlainviewembed.h>
+#include <champlain-gtk/champlain-gtk.h>
 #include <clutter-gtk/gtk-clutter-embed.h>
 
 #define OSM_MAP "Open Street Map"