gnome-terminal r2834 - in trunk/src: . skey

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:58:37 2008
New Revision: 2834
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2834&view=rev

Log:
Build with *_DISABLE_SINGLE_INCLUDES, with a few workarounds due to broken bonobo and libgnome* headers.


Modified:
   trunk/src/Makefile.am
   trunk/src/skey/Makefile.am
   trunk/src/skey/md5.c
   trunk/src/skey/sha1.c
   trunk/src/terminal-app.c
   trunk/src/terminal-util.c
   trunk/src/terminal.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu May 29 19:58:37 2008
@@ -44,6 +44,11 @@
 	-DTERM_PKGDATADIR=\"$(pkgdatadir)\" \
 	-DSN_API_NOT_YET_FROZEN \
 	-DGDK_MULTIHEAD_SAFE \
+	-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)
 

Modified: trunk/src/skey/Makefile.am
==============================================================================
--- trunk/src/skey/Makefile.am	(original)
+++ trunk/src/skey/Makefile.am	Thu May 29 19:58:37 2008
@@ -19,6 +19,7 @@
 
 libskey_la_CPPFLAGS = \
 	-I$(srcdir)/.. \
+	-DG_DISABLE_SINGLE_INCLUDES \
 	$(DISABLE_DEPRECATED) \
 	$(AM_CPPFLAGS)
 

Modified: trunk/src/skey/md5.c
==============================================================================
--- trunk/src/skey/md5.c	(original)
+++ trunk/src/skey/md5.c	Thu May 29 19:58:37 2008
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 
 #include <string.h>
-#include <glib/gchecksum.h>
+#include <glib.h>
 
 #include "skey.h"
 #include "skeyutil.h"

Modified: trunk/src/skey/sha1.c
==============================================================================
--- trunk/src/skey/sha1.c	(original)
+++ trunk/src/skey/sha1.c	Thu May 29 19:58:37 2008
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <arpa/inet.h>
 
-#include <glib/gchecksum.h>
+#include <glib.h>
 
 #include "skey.h"
 #include "skeyutil.h"

Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c	(original)
+++ trunk/src/terminal-app.c	Thu May 29 19:58:37 2008
@@ -21,6 +21,9 @@
 
 #include <config.h>
 
+#include <glib.h>
+#undef G_DISABLE_SINGLE_INCLUDES
+
 #include "terminal-intl.h"
 
 #include "terminal-app.h"
@@ -30,10 +33,6 @@
 #include "profile-editor.h"
 #include "encoding.h"
 #include <gconf/gconf-client.h>
-#include <bonobo-activation/bonobo-activation-activate.h>
-#include <bonobo-activation/bonobo-activation-register.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-listener.h>
 #include <libgnome/gnome-help.h>
 #include <libgnomeui/gnome-url.h>
 #include <libgnomeui/gnome-client.h>

Modified: trunk/src/terminal-util.c
==============================================================================
--- trunk/src/terminal-util.c	(original)
+++ trunk/src/terminal-util.c	Thu May 29 19:58:37 2008
@@ -27,6 +27,9 @@
 #include <unistd.h>
 #include <sys/types.h>
 
+#include <glib.h>
+#undef G_DISABLE_SINGLE_INCLUDES
+
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Thu May 29 19:58:37 2008
@@ -21,9 +21,12 @@
 
 #include <config.h>
 
+#include <glib.h>
+
 #include "terminal-intl.h"
 
 #undef BONOBO_DISABLE_DEPRECATED
+#undef G_DISABLE_SINGLE_INCLUDES
 
 #include "terminal-app.h"
 #include "terminal-accels.h"