From: Xavier Claessens <xclaesse@gmail.com>
Date: Sun, 19 Apr 2009 08:22:33 +0000 (+0200)
Subject: Merge commit 'bigon/configure-deprecated-flag'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=c01c53db88c603b3f7150c6f763e5bd810ddf8ea;hp=897d9bffefe278e587390355d83009d8ee97a588

Merge commit 'bigon/configure-deprecated-flag'
---

diff --git a/configure.ac b/configure.ac
index 16f8f354..c3926fdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,11 +36,8 @@ ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
 LIBCANBERRA_GTK_REQUIRED=0.4
 
-# Uncomment that to build with deprecated symbols disabled
-#AC_DEFINE(G_DISABLE_DEPRECATED, [], [Disable deprecated GLib symbols])
-#AC_DEFINE(GDK_PIXBUF_DISABLE_DEPRECATED, [], [Disable deprecated GDK pixbuf symbols])
-#AC_DEFINE(GDK_DISABLE_DEPRECATED, [], [Disable deprecated GDK symbols])
-#AC_DEFINE(GTK_DISABLE_DEPRECATED, [], [Disable deprecated GTK symbols])
+# Use --enable-maintainer-mode to disabled deprecated symbols
+GNOME_MAINTAINER_MODE_DEFINES
 
 # Uncomment that to build with single include disabled
 #AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 0a57fe32..e5b1ea11 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,5 +1,7 @@
 tools_dir = $(top_srcdir)/tools
 
+AM_CPPFLAGS = $(DISABLE_DEPRECATED)
+
 AM_CFLAGS = \
     -I$(top_srcdir) \
     -I$(top_builddir) \
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index c192affe..6f3b99ba 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS =                                           \
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(LIBEMPATHYGTK_CFLAGS)				\
 	$(ENCHANT_CFLAGS)				\
-	$(WARN_CFLAGS)
+	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
 	empathy-gtk-marshal.h				\
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 38706828..f82f4cc0 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS =                                           \
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DLOCALEDIR=\""$(datadir)/locale"\"		\
 	$(LIBEMPATHY_CFLAGS)				\
-	$(WARN_CFLAGS)
+	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
 	empathy-marshal.h				\
diff --git a/megaphone/src/Makefile.am b/megaphone/src/Makefile.am
index d5876943..9bb330b2 100644
--- a/megaphone/src/Makefile.am
+++ b/megaphone/src/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
 	-DPKGDATADIR=\""$(pkgdatadir)"\" \
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DIMAGEDIR=\"$(datadir)/empathy\" \
-	$(MEGAPHONE_CFLAGS) $(WARN_CFLAGS)
+	$(MEGAPHONE_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 libexec_PROGRAMS = megaphone-applet
 megaphone_applet_SOURCES = 					\
diff --git a/nothere/src/Makefile.am b/nothere/src/Makefile.am
index b4b016af..d2ff7fe4 100644
--- a/nothere/src/Makefile.am
+++ b/nothere/src/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
 	-DPKGDATADIR=\""$(pkgdatadir)"\" \
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DIMAGEDIR=\"$(datadir)/empathy\" \
-	$(NOTHERE_CFLAGS) $(WARN_CFLAGS)
+	$(NOTHERE_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 libexec_PROGRAMS = nothere-applet
 nothere_applet_SOURCES = 					\
diff --git a/python/pyempathy/Makefile.am b/python/pyempathy/Makefile.am
index fa973bf0..8ec61ff8 100644
--- a/python/pyempathy/Makefile.am
+++ b/python/pyempathy/Makefile.am
@@ -8,7 +8,8 @@ AM_CPPFLAGS =                                           \
 	-DDATADIR=\""$(datadir)"\"              	\
 	$(PYTHON_BINDING_CFLAGS)			\
 	$(PYTHON_INCLUDES)				\
-	$(WARN_CFLAGS)
+	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
 	pyempathy.c					
diff --git a/python/pyempathygtk/Makefile.am b/python/pyempathygtk/Makefile.am
index ba0ee11d..84204e76 100644
--- a/python/pyempathygtk/Makefile.am
+++ b/python/pyempathygtk/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS =                                           \
 	-I$(top_srcdir)                                 \
 	-DDATADIR=\""$(datadir)"\"              	\
 	$(PYTHON_BINDING_CFLAGS)			\
-	$(PYTHON_INCLUDES)
+	$(PYTHON_INCLUDES)				\
+	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
 	pyempathygtk.c					
diff --git a/src/Makefile.am b/src/Makefile.am
index 4b154131..76a5aa77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,8 @@ AM_CPPFLAGS =						\
 	-I$(top_srcdir)                          	\
 	$(EMPATHY_CFLAGS)				\
 	$(LIBNOTIFY_CFLAGS)				\
-	$(WARN_CFLAGS)
+	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED)
 
 LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 42ebea55..67f6ec9a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,7 +14,8 @@ AM_CPPFLAGS =						\
 	-I$(top_srcdir)                          	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
-	$(WARN_CFLAGS)
+	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED)
 
 LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\