Commit ca8122c0 authored by Christian Persch's avatar Christian Persch

Make only gucharmap/gucharmap.h includable from outside gucharmap.

svn path=/trunk/; revision=1637
parent cbf12da9
......@@ -48,6 +48,7 @@ libgucharmap_la_SOURCES = \
libgucharmap_la_CPPFLAGS = \
-I$(top_srcdir) \
-DGUCHARMAP_COMPILATION \
-DDATADIR=\"$(datadir)\" \
-DLOCALEDIR=\"$(localedir)\" \
$(DISABLE_DEPRECATED) \
......@@ -70,14 +71,18 @@ libgucharmap_la_LIBADD = \
$(GCONF_LIBS) \
$(INTL_LIBS)
libgucharmapincludedir = $(includedir)/gucharmap
libgucharmapmainincludedir = $(includedir)/gucharmap-2
libgucharmapmaininclude_HEADERS = \
gucharmap.h \
$(NULL)
libgucharmapincludedir = $(includedir)/gucharmap-2/gucharmap
libgucharmapinclude_HEADERS = \
gucharmap-block-chapters-model.h \
gucharmap-chapters-model.h \
gucharmap-chapters-view.h \
gucharmap-charmap.h \
gucharmap-codepoint-list.h \
gucharmap.h \
gucharmap-mini-fontsel.h \
gucharmap-script-chapters-model.h \
gucharmap-script-codepoint-list.h \
......
......@@ -20,6 +20,10 @@
/* block means unicode block */
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_BLOCK_CHAPTERS_MODEL_H
#define GUCHARMAP_BLOCK_CHAPTERS_MODEL_H
......
......@@ -17,6 +17,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA
*/
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_CHAPTERS_MODEL_H
#define GUCHARMAP_CHAPTERS_MODEL_H
......
......@@ -18,6 +18,10 @@
/* block means unicode block */
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_CHAPTERS_VIEW_H
#define GUCHARMAP_CHAPTERS_VIEW_H
......
......@@ -16,6 +16,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA
*/
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_CHARMAP_H
#define GUCHARMAP_CHARMAP_H
......
......@@ -17,6 +17,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA
*/
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_CHARTABLE_H
#define GUCHARMAP_CHARTABLE_H
......
......@@ -17,6 +17,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA
*/
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_CODEPOINT_LIST_H
#define GUCHARMAP_CODEPOINT_LIST_H
......
......@@ -17,6 +17,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA
*/
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_MINI_FONTSEL_H
#define GUCHARMAP_MINI_FONTSEL_H
......
......@@ -18,6 +18,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA
*/
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_SCRIPT_CHAPTERS_MODEL_H
#define GUCHARMAP_SCRIPT_CHAPTERS_MODEL_H
......
......@@ -17,6 +17,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA
*/
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_SCRIPT_CODEPOINT_LIST_H
#define GUCHARMAP_SCRIPT_CODEPOINT_LIST_H
......
......@@ -19,6 +19,10 @@
/* GucharmapSearchDialog handles all aspects of searching */
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_SEARCH_DIALOG_H
#define GUCHARMAP_SEARCH_DIALOG_H
......
......@@ -21,7 +21,7 @@
#include <glib.h>
#include <gtk/gtkwindow.h>
#include <gucharmap/gucharmap-chapters-model.h>
#include <gucharmap/gucharmap.h>
G_BEGIN_DECLS
......
......@@ -17,6 +17,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA
*/
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_UNICODE_INFO_H
#define GUCHARMAP_UNICODE_INFO_H
......
......@@ -15,6 +15,10 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA
*/
#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
#error "Only <gucharmap/gucharmap.h> can be included directly."
#endif
#ifndef GUCHARMAP_WINDOW_H
#define GUCHARMAP_WINDOW_H
......
......@@ -20,6 +20,8 @@
#ifndef GUCHARMAP_H
#define GUCHARMAP_H
#define __GUCHARMAP_GUCHARMAP_H_INSIDE__
#include <gucharmap/gucharmap-chartable.h>
#include <gucharmap/gucharmap-charmap.h>
#include <gucharmap/gucharmap-window.h>
......@@ -32,4 +34,6 @@
#include <gucharmap/gucharmap-script-chapters-model.h>
#include <gucharmap/gucharmap-search-dialog.h>
#undef __GUCHARMAP_GUCHARMAP_H_INSIDE__
#endif /* #ifndef GUCHARMAP_H */
......@@ -19,11 +19,12 @@
#include "config.h"
#include <gtk/gtk.h>
#include <stdlib.h>
#include"gucharmap-intl.h"
#include "gucharmap-window.h"
#include "gucharmap-mini-fontsel.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gucharmap/gucharmap.h>
#include "gucharmap-settings.h"
gint
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment