GNOME.org
 

gucharmap r1637 - trunk/gucharmap

Author: chpe
Date: Fri Mar 21 10:48:02 2008
New Revision: 1637
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1637&view=rev

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


Modified:
   trunk/gucharmap/Makefile.am
   trunk/gucharmap/gucharmap-block-chapters-model.h
   trunk/gucharmap/gucharmap-chapters-model.h
   trunk/gucharmap/gucharmap-chapters-view.h
   trunk/gucharmap/gucharmap-charmap.h
   trunk/gucharmap/gucharmap-chartable.h
   trunk/gucharmap/gucharmap-codepoint-list.h
   trunk/gucharmap/gucharmap-mini-fontsel.h
   trunk/gucharmap/gucharmap-script-chapters-model.h
   trunk/gucharmap/gucharmap-script-codepoint-list.h
   trunk/gucharmap/gucharmap-search-dialog.h
   trunk/gucharmap/gucharmap-settings.h
   trunk/gucharmap/gucharmap-unicode-info.h
   trunk/gucharmap/gucharmap-window.h
   trunk/gucharmap/gucharmap.h
   trunk/gucharmap/main.c

Modified: trunk/gucharmap/Makefile.am
==============================================================================
--- trunk/gucharmap/Makefile.am	(original)
+++ trunk/gucharmap/Makefile.am	Fri Mar 21 10:48:02 2008
@@ -48,6 +48,7 @@
 
 libgucharmap_la_CPPFLAGS = \
 	-I$(top_srcdir)			\
+	-DGUCHARMAP_COMPILATION		\
 	-DDATADIR=\"$(datadir)\"	\
 	-DLOCALEDIR=\"$(localedir)\"	\
 	$(DISABLE_DEPRECATED)		\
@@ -70,14 +71,18 @@
 	$(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 \

Modified: trunk/gucharmap/gucharmap-block-chapters-model.h
==============================================================================
--- trunk/gucharmap/gucharmap-block-chapters-model.h	(original)
+++ trunk/gucharmap/gucharmap-block-chapters-model.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-chapters-model.h
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-model.h	(original)
+++ trunk/gucharmap/gucharmap-chapters-model.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-chapters-view.h
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-view.h	(original)
+++ trunk/gucharmap/gucharmap-chapters-view.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-charmap.h
==============================================================================
--- trunk/gucharmap/gucharmap-charmap.h	(original)
+++ trunk/gucharmap/gucharmap-charmap.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-chartable.h
==============================================================================
--- trunk/gucharmap/gucharmap-chartable.h	(original)
+++ trunk/gucharmap/gucharmap-chartable.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-codepoint-list.h
==============================================================================
--- trunk/gucharmap/gucharmap-codepoint-list.h	(original)
+++ trunk/gucharmap/gucharmap-codepoint-list.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-mini-fontsel.h
==============================================================================
--- trunk/gucharmap/gucharmap-mini-fontsel.h	(original)
+++ trunk/gucharmap/gucharmap-mini-fontsel.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-script-chapters-model.h
==============================================================================
--- trunk/gucharmap/gucharmap-script-chapters-model.h	(original)
+++ trunk/gucharmap/gucharmap-script-chapters-model.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-script-codepoint-list.h
==============================================================================
--- trunk/gucharmap/gucharmap-script-codepoint-list.h	(original)
+++ trunk/gucharmap/gucharmap-script-codepoint-list.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-search-dialog.h
==============================================================================
--- trunk/gucharmap/gucharmap-search-dialog.h	(original)
+++ trunk/gucharmap/gucharmap-search-dialog.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-settings.h
==============================================================================
--- trunk/gucharmap/gucharmap-settings.h	(original)
+++ trunk/gucharmap/gucharmap-settings.h	Fri Mar 21 10:48:02 2008
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include <gtk/gtkwindow.h>
-#include <gucharmap/gucharmap-chapters-model.h>
+#include <gucharmap/gucharmap.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gucharmap/gucharmap-unicode-info.h
==============================================================================
--- trunk/gucharmap/gucharmap-unicode-info.h	(original)
+++ trunk/gucharmap/gucharmap-unicode-info.h	Fri Mar 21 10:48:02 2008
@@ -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
 

Modified: trunk/gucharmap/gucharmap-window.h
==============================================================================
--- trunk/gucharmap/gucharmap-window.h	(original)
+++ trunk/gucharmap/gucharmap-window.h	Fri Mar 21 10:48:02 2008
@@ -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

Modified: trunk/gucharmap/gucharmap.h
==============================================================================
--- trunk/gucharmap/gucharmap.h	(original)
+++ trunk/gucharmap/gucharmap.h	Fri Mar 21 10:48:02 2008
@@ -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 */

Modified: trunk/gucharmap/main.c
==============================================================================
--- trunk/gucharmap/main.c	(original)
+++ trunk/gucharmap/main.c	Fri Mar 21 10:48:02 2008
@@ -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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]