Use autotools magic to take care of disabling deprecated symbols

Passing --enable-maintainer-mode to the configure will disable
deprecated symbols

diff --git a/configure.ac b/configure.ac
index a071ea87647d69aef49956c1b80ece525cd8d476..397e61bbaf89fbecc6722fbbbaabcdf048e3ec8f 100644 (file)
--- 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 0a57fe323f8bb39355cfab57683cd05f49f7f068..e5b1ea1135a51977920d64fd990633283a631ea2 100644 (file)
--- 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 c192affef780aff9045e0ef7a48c3d9d681f526f..6f3b99ba6e98282345e3ee69e858bbe9bb5c51e7 100644 (file)
--- 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 3870682829fa05ee0a2e9aa552c0d30df7e07100..f82f4cc0fd1c08af946afb3e33328c0ff8ad9df2 100644 (file)
--- 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 d5876943c140820d4ab0a2e0b6b2c23a986bd5ae..9bb330b291d616103090168c2f7955e4951201fb 100644 (file)
--- 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 b4b016afcae232c04f4ca3b18a8d5b345d305b2c..d2ff7fe4fb4a09b52d30d753c23b895eb70c0efb 100644 (file)
--- 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 fa973bf0375f4f57e0bc558ccb8f596c23f4029d..8ec61ff8e99815765436425f10f59028d2cc9e00 100644 (file)
--- 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 ba0ee11dfde11232a9a032cbe6a9d268c51909c2..84204e76402c85b1430a63d3b20853cd9d90824a 100644 (file)
--- 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 4b1541312e7ac3df189c88049a84fa84dd4ab332..76a5aa77da951ed35c0db2f0397fd1386ce0483b 100644 (file)
--- 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 42ebea555503b93846f3632f5c3158c68ac7df53..67f6ec9af8647af47b20d4476728ee84936197b1 100644 (file)
--- 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        \