libbonobo r3511 - in trunk: . bonobo bonobo-activation monikers samples/echo tests tests/test-activation

[cosimoc svn gnome org]

Author: cosimoc
Date: Fri Oct 17 19:53:46 2008
New Revision: 3511
URL: http://svn.gnome.org/viewvc/libbonobo?rev=3511&view=rev

Log:
2008-10-17  Cosimo Cecchi  <cosimoc gnome org>

	* bonobo-activation/Makefile.am:
	* bonobo-activation/bonobo-activation-client.h:
	* bonobo/Makefile.am:
	* bonobo/bonobo-main.c:
	* bonobo/bonobo-running-context.c:
	* configure.in:
	* monikers/Makefile.am:
	* tests/Makefile.am:
	* tests/test-activation/Makefile.am:
	Use and enforce single GLib includes.


Modified:
   trunk/ChangeLog
   trunk/bonobo-activation/Makefile.am
   trunk/bonobo-activation/bonobo-activation-client.h
   trunk/bonobo/Makefile.am
   trunk/bonobo/bonobo-main.c
   trunk/bonobo/bonobo-running-context.c
   trunk/configure.in
   trunk/monikers/Makefile.am
   trunk/samples/echo/ChangeLog
   trunk/samples/echo/Makefile.am
   trunk/tests/Makefile.am
   trunk/tests/test-activation/Makefile.am

Modified: trunk/bonobo-activation/Makefile.am
==============================================================================
--- trunk/bonobo-activation/Makefile.am	(original)
+++ trunk/bonobo-activation/Makefile.am	Fri Oct 17 19:53:46 2008
@@ -12,7 +12,7 @@
         -DBONOBO_ACTIVATION_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
 	$(LIBBONOBO_CFLAGS)			\
 	-DVERSION=\"$(VERSION)\"		\
-	-DG_DISABLE_DEPRECATED			\
+	$(DISABLE_DEPRECATED_CFLAGS)		\
 	-DG_LOG_DOMAIN=\"Bonobo-Activation\"	\
 	$(NULL)
 

Modified: trunk/bonobo-activation/bonobo-activation-client.h
==============================================================================
--- trunk/bonobo-activation/bonobo-activation-client.h	(original)
+++ trunk/bonobo-activation/bonobo-activation-client.h	Fri Oct 17 19:53:46 2008
@@ -1,7 +1,7 @@
 #ifndef BONOBO_ACTIVATION_CLIENT_H
 #define BONOBO_ACTIVATION_CLIENT_H
 
-#include <glib/gutils.h>
+#include <glib.h>
 #include <bonobo-activation-private.h>
 
 void bonobo_activation_release_corba_client (void);

Modified: trunk/bonobo/Makefile.am
==============================================================================
--- trunk/bonobo/Makefile.am	(original)
+++ trunk/bonobo/Makefile.am	Fri Oct 17 19:53:46 2008
@@ -12,7 +12,7 @@
         -DBONOBO_LOCALSTATEDIR=\""$(localstatedir)"\" 	\
         -DBONOBO_LOCALEDIR=\""$(datadir)/locale"\" 	\
 	-DBONOBO_EXPLICIT_TRANSLATION_DOMAIN="GETTEXT_PACKAGE"	\
-	-DG_DISABLE_DEPRECATED				\
+	$(DISABLE_DEPRECATED_CFLAGS)			\
 	-DG_LOG_DOMAIN=\"Bonobo\"			\
 	-DVERSION=\"$(VERSION)\"
 

Modified: trunk/bonobo/bonobo-main.c
==============================================================================
--- trunk/bonobo/bonobo-main.c	(original)
+++ trunk/bonobo/bonobo-main.c	Fri Oct 17 19:53:46 2008
@@ -25,7 +25,7 @@
 #include <libintl.h>
 #include <string.h>
 
-#include <glib/gmain.h>
+#include <glib.h>
 
 #ifdef HAVE_GTHREADS
 GMutex                   *_bonobo_lock;

Modified: trunk/bonobo/bonobo-running-context.c
==============================================================================
--- trunk/bonobo/bonobo-running-context.c	(original)
+++ trunk/bonobo/bonobo-running-context.c	Fri Oct 17 19:53:46 2008
@@ -9,7 +9,7 @@
  */
 #include <config.h>
 #include <stdio.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include <bonobo/bonobo-context.h>

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Oct 17 19:53:46 2008
@@ -128,6 +128,11 @@
 AC_SUBST(SERVER_LIBS)
 AC_SUBST(SERVER_CFLAGS)
 
+if test "$enable_maintainer_mode" = "yes"; then
+	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
+	AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+fi
+
 # orbit-idl
 ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
 AC_SUBST(ORBIT_IDL)

Modified: trunk/monikers/Makefile.am
==============================================================================
--- trunk/monikers/Makefile.am	(original)
+++ trunk/monikers/Makefile.am	Fri Oct 17 19:53:46 2008
@@ -9,6 +9,7 @@
         -DBONOBO_BINDIR=\""$(bindir)"\" 		\
         -DBONOBO_LOCALSTATEDIR=\""$(localstatedir)"\" 	\
         -DBONOBO_LOCALEDIR=\""$(datadir)/locale"\" 	\
+	$(DISABLE_DEPRECATED_CFLAGS)			\
 	-DG_LOG_DOMAIN=\"Bonobo\"			\
 	-DVERSION=\"$(VERSION)\"
 

Modified: trunk/samples/echo/Makefile.am
==============================================================================
--- trunk/samples/echo/Makefile.am	(original)
+++ trunk/samples/echo/Makefile.am	Fri Oct 17 19:53:46 2008
@@ -58,6 +58,7 @@
 	-DG_LOG_DOMAIN=\"Echo\"				\
 	-I$(top_srcdir) 				\
 	$(LIBBONOBO_CFLAGS)				\
+	$(DISABLE_DEPRECATED_CFLAGS)			\
 	$(WARN_CFLAGS)
 
 CLEANFILES =  $(server_dot_in) $(server_DATA)

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Fri Oct 17 19:53:46 2008
@@ -18,7 +18,8 @@
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-I$(top_srcdir) 				\
 	$(WARN_CFLAGS)					\
-	$(LIBBONOBO_CFLAGS)
+	$(LIBBONOBO_CFLAGS)				\
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 LDADD =	$(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS)
 

Modified: trunk/tests/test-activation/Makefile.am
==============================================================================
--- trunk/tests/test-activation/Makefile.am	(original)
+++ trunk/tests/test-activation/Makefile.am	Fri Oct 17 19:53:46 2008
@@ -77,7 +77,7 @@
 	-I$(top_srcdir)			\
 	-I$(top_builddir)		\
 	$(WARN_CFLAGS)			\
-	-DG_DISABLE_DEPRECATED $(LIBBONOBO_CFLAGS)
+	$(DISABLE_DEPRECATED_CFLAGS) $(LIBBONOBO_CFLAGS)
 
 LDADD = ../../bonobo-activation/libbonobo-activation.la \
 	$(LIBBONOBO_LIBS)