diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-04-19 16:22:33 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-04-19 16:22:33 +0800 |
| commit | c01c53db88c603b3f7150c6f763e5bd810ddf8ea (patch) | |
| tree | 05acbf59b037c84453632f48012675b0c3b44315 | |
| parent | 897d9bffefe278e587390355d83009d8ee97a588 (diff) | |
| parent | e71bed8e3b0016f489ea420114cbe89dabf77896 (diff) | |
| download | gsoc2013-empathy-c01c53db88c603b3f7150c6f763e5bd810ddf8ea.tar gsoc2013-empathy-c01c53db88c603b3f7150c6f763e5bd810ddf8ea.tar.gz gsoc2013-empathy-c01c53db88c603b3f7150c6f763e5bd810ddf8ea.tar.bz2 gsoc2013-empathy-c01c53db88c603b3f7150c6f763e5bd810ddf8ea.tar.lz gsoc2013-empathy-c01c53db88c603b3f7150c6f763e5bd810ddf8ea.tar.xz gsoc2013-empathy-c01c53db88c603b3f7150c6f763e5bd810ddf8ea.tar.zst gsoc2013-empathy-c01c53db88c603b3f7150c6f763e5bd810ddf8ea.zip | |
Merge commit 'bigon/configure-deprecated-flag'
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | extensions/Makefile.am | 2 | ||||
| -rw-r--r-- | libempathy-gtk/Makefile.am | 3 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 3 | ||||
| -rw-r--r-- | megaphone/src/Makefile.am | 2 | ||||
| -rw-r--r-- | nothere/src/Makefile.am | 2 | ||||
| -rw-r--r-- | python/pyempathy/Makefile.am | 3 | ||||
| -rw-r--r-- | python/pyempathygtk/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 |
10 files changed, 18 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 16f8f354f..c3926fdb2 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 0a57fe323..e5b1ea113 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 c192affef..6f3b99ba6 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 387068282..f82f4cc0f 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 d5876943c..9bb330b29 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 b4b016afc..d2ff7fe4f 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 fa973bf03..8ec61ff8e 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 ba0ee11df..84204e764 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 4b1541312..76a5aa77d 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 42ebea555..67f6ec9af 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 \ |