gucharmap r1811 - trunk/gucharmap

From: chpe svn gnome org
To: svn-commits-list gnome org
Subject: gucharmap r1811 - trunk/gucharmap
Date: Sun, 15 Jun 2008 21:35:43 +0000 (UTC)
Author: chpe
Date: Sun Jun 15 21:35:43 2008
New Revision: 1811
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1811&view=rev

Log:
Build with *_DISABLE_SINGLE_INCLUDES.


Modified:
   trunk/gucharmap/Makefile.am
   trunk/gucharmap/gen-guch-unicode-tables.pl
   trunk/gucharmap/unicode-blocks.h
   trunk/gucharmap/unicode-categories.h
   trunk/gucharmap/unicode-names.h
   trunk/gucharmap/unicode-nameslist.h
   trunk/gucharmap/unicode-scripts.h
   trunk/gucharmap/unicode-unihan.h
   trunk/gucharmap/unicode-versions.h

Modified: trunk/gucharmap/Makefile.am
==============================================================================
--- trunk/gucharmap/Makefile.am	(original)
+++ trunk/gucharmap/Makefile.am	Sun Jun 15 21:35:43 2008
@@ -61,11 +61,16 @@
 	$(NULL)
 
 libgucharmap_la_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-DGUCHARMAP_COMPILATION		\
-	-DDATADIR=\"$(datadir)\"	\
-	-DLOCALEDIR=\"$(datadir)/locale\"	\
-	$(DISABLE_DEPRECATED)		\
+	-I$(top_srcdir) \
+	-DGUCHARMAP_COMPILATION \
+	-DDATADIR=\"$(datadir)\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DG_DISABLE_SINGLE_INCLUDES \
+	-DPANGO_DISABLE_SINGLE_INCLUDES \
+	-DGDK_DISABLE_SINGLE_INCLUDES \
+	-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
+	-DGTK_DISABLE_SINGLE_INCLUDES \
+	$(DISABLE_DEPRECATED) \
 	$(AM_CPPFLAGS)
 
 libgucharmap_la_CFLAGS = \
@@ -115,10 +120,15 @@
 	$(NULL)
 
 gucharmap_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-DDATADIR=\"$(datadir)\"	\
-	-DLOCALEDIR=\"$(datadir)/locale\"	\
-	$(DISABLE_DEPRECATED)		\
+	-I$(top_srcdir) \
+	-DDATADIR=\"$(datadir)\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DG_DISABLE_SINGLE_INCLUDES \
+	-DPANGO_DISABLE_SINGLE_INCLUDES \
+	-DGDK_DISABLE_SINGLE_INCLUDES \
+	-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
+	-DGTK_DISABLE_SINGLE_INCLUDES \
+	$(DISABLE_DEPRECATED) \
 	$(AM_CPPFLAGS)
 
 gucharmap_CFLAGS = \

Modified: trunk/gucharmap/gen-guch-unicode-tables.pl
==============================================================================
--- trunk/gucharmap/gen-guch-unicode-tables.pl	(original)
+++ trunk/gucharmap/gen-guch-unicode-tables.pl	Sun Jun 15 21:35:43 2008
@@ -100,7 +100,7 @@
     print $out "#ifndef UNICODE_NAMES_H\n";
     print $out "#define UNICODE_NAMES_H\n\n";
 
-    print $out "#include <glib/gunicode.h>\n\n";
+    print $out "#include <glib.h>\n\n";
     print $out "#include <glib/gi18n-lib.h>\n\n";
 
     my @unicode_pairs;
@@ -232,7 +232,7 @@
     print $out "#ifndef UNICODE_CATEGORIES_H\n";
     print $out "#define UNICODE_CATEGORIES_H\n\n";
 
-    print $out "#include <glib/gunicode.h>\n\n";
+    print $out "#include <glib.h>\n\n";
 
     print $out "typedef struct _UnicodeCategory UnicodeCategory;\n\n";
 
@@ -308,7 +308,7 @@
     print $out "#ifndef UNICODE_UNIHAN_H\n";
     print $out "#define UNICODE_UNIHAN_H\n\n";
 
-    print $out "#include <glib/gunicode.h>\n\n";
+    print $out "#include <glib.h>\n\n";
 
     print $out "typedef struct _Unihan Unihan;\n\n";
 
@@ -611,7 +611,7 @@
     print $out "#ifndef UNICODE_NAMESLIST_H\n";
     print $out "#define UNICODE_NAMESLIST_H\n\n";
 
-    print $out "#include <glib/gunicode.h>\n\n";
+    print $out "#include <glib.h>\n\n";
 
     print $out "typedef struct _UnicharStringIndex UnicharStringIndex;\n";
     print $out "typedef struct _UnicharUnichar UnicharUnichar;\n";
@@ -702,7 +702,7 @@
     print $out "#ifndef UNICODE_BLOCKS_H\n";
     print $out "#define UNICODE_BLOCKS_H\n\n";
 
-    print $out "#include <glib/gunicode.h>\n";
+    print $out "#include <glib.h>\n";
     print $out "#include <glib/gi18n-lib.h>\n\n";
 
     my @blocks;
@@ -830,7 +830,7 @@
     print $out "#ifndef UNICODE_SCRIPTS_H\n";
     print $out "#define UNICODE_SCRIPTS_H\n\n";
 
-    print $out "#include <glib/gunicode.h>\n";
+    print $out "#include <glib.h>\n";
     print $out "#include <glib/gi18n-lib.h>\n\n";
 
     print $out "typedef struct _UnicodeScript UnicodeScript;\n\n";
@@ -943,7 +943,7 @@
     print $out "#ifndef UNICODE_VERSIONS_H\n";
     print $out "#define UNICODE_VERSIONS_H\n\n";
 
-    print $out "#include <glib/gunicode.h>\n";
+    print $out "#include <glib.h>\n";
     print $out "#include <glib/gi18n-lib.h>\n\n";
 
     print $out "typedef struct {\n";

Modified: trunk/gucharmap/unicode-blocks.h
==============================================================================
--- trunk/gucharmap/unicode-blocks.h	(original)
+++ trunk/gucharmap/unicode-blocks.h	Sun Jun 15 21:35:43 2008
@@ -6,7 +6,7 @@
 #ifndef UNICODE_BLOCKS_H
 #define UNICODE_BLOCKS_H
 
-#include <glib/gunicode.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 /* for extraction by intltool */

Modified: trunk/gucharmap/unicode-categories.h
==============================================================================
--- trunk/gucharmap/unicode-categories.h	(original)
+++ trunk/gucharmap/unicode-categories.h	Sun Jun 15 21:35:43 2008
@@ -6,7 +6,7 @@
 #ifndef UNICODE_CATEGORIES_H
 #define UNICODE_CATEGORIES_H
 
-#include <glib/gunicode.h>
+#include <glib.h>
 
 typedef struct _UnicodeCategory UnicodeCategory;
 

Modified: trunk/gucharmap/unicode-names.h
==============================================================================
--- trunk/gucharmap/unicode-names.h	(original)
+++ trunk/gucharmap/unicode-names.h	Sun Jun 15 21:35:43 2008
@@ -6,7 +6,7 @@
 #ifndef UNICODE_NAMES_H
 #define UNICODE_NAMES_H
 
-#include <glib/gunicode.h>
+#include <glib.h>
 
 #include <glib/gi18n-lib.h>
 

Modified: trunk/gucharmap/unicode-nameslist.h
==============================================================================
--- trunk/gucharmap/unicode-nameslist.h	(original)
+++ trunk/gucharmap/unicode-nameslist.h	Sun Jun 15 21:35:43 2008
@@ -6,7 +6,7 @@
 #ifndef UNICODE_NAMESLIST_H
 #define UNICODE_NAMESLIST_H
 
-#include <glib/gunicode.h>
+#include <glib.h>
 
 typedef struct _UnicharStringIndex UnicharStringIndex;
 typedef struct _UnicharUnichar UnicharUnichar;

Modified: trunk/gucharmap/unicode-scripts.h
==============================================================================
--- trunk/gucharmap/unicode-scripts.h	(original)
+++ trunk/gucharmap/unicode-scripts.h	Sun Jun 15 21:35:43 2008
@@ -6,7 +6,7 @@
 #ifndef UNICODE_SCRIPTS_H
 #define UNICODE_SCRIPTS_H
 
-#include <glib/gunicode.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 typedef struct _UnicodeScript UnicodeScript;

Modified: trunk/gucharmap/unicode-unihan.h
==============================================================================
--- trunk/gucharmap/unicode-unihan.h	(original)
+++ trunk/gucharmap/unicode-unihan.h	Sun Jun 15 21:35:43 2008
@@ -6,7 +6,7 @@
 #ifndef UNICODE_UNIHAN_H
 #define UNICODE_UNIHAN_H
 
-#include <glib/gunicode.h>
+#include <glib.h>
 
 typedef struct _Unihan Unihan;
 

Modified: trunk/gucharmap/unicode-versions.h
==============================================================================
--- trunk/gucharmap/unicode-versions.h	(original)
+++ trunk/gucharmap/unicode-versions.h	Sun Jun 15 21:35:43 2008
@@ -6,7 +6,7 @@
 #ifndef UNICODE_VERSIONS_H
 #define UNICODE_VERSIONS_H
 
-#include <glib/gunicode.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 typedef struct {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]