build: use GNOME_MAINTAINER_MODE_DEFINES

Instead of defining our own set of deprecation cflags.

configure.in

@@ -29,6 +29,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_MAINTAINER_MODE([enable])
+GNOME_MAINTAINER_MODE_DEFINES
 
 dnl We need to decrement current by one in the calculation of the age because
 dnl the library was started with version "1:0:0" instead of "0:0:0"
@@ -288,9 +289,6 @@ PKG_CHECK_MODULES(NAUTILUS, [
 AC_SUBST(NAUTILUS_CFLAGS)
 AC_SUBST(NAUTILUS_LIBS)
 
-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
-AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-
 dnl Multimedia keys
 AC_CHECK_HEADERS([X11/XF86keysym.h])
 

docs/reference/libnautilus-extension/Makefile.am

@@ -18,10 +18,6 @@ DOC_SOURCE_DIR=$(top_srcdir)/libnautilus-extension
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
 
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
-
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 

eel/Makefile.am

@@ -9,7 +9,7 @@ INCLUDES =						\
 	$(BASE_CFLAGS)					\
 	$(COMMON_CFLAGS)				\
 	$(WARNING_CFLAGS)				\
-	$(DISABLE_DEPRECATED_CFLAGS)			\
+	$(DISABLE_DEPRECATED)				\
 	-DDATADIR=\""$(datadir)"\"			\
 	-DSOURCE_DATADIR=\""$(top_srcdir)/data"\"	\
 	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\

libnautilus-extension/Makefile.am

@@ -9,7 +9,7 @@ INCLUDES=\
 	-I$(top_builddir) \
 	$(BASE_CFLAGS) \
 	$(WARNING_CFLAGS) \
-	$(DISABLE_DEPRECATED_CFLAGS) \
+	$(DISABLE_DEPRECATED) \
 	-DDATADIR=\""$(datadir)"\" \
 	$(NULL)
 

libnautilus-private/Makefile.am

@@ -10,7 +10,7 @@ INCLUDES = 						\
 	$(COMMON_CFLAGS)				\
 	$(NAUTILUS_CFLAGS)				\
 	$(WARNING_CFLAGS)				\
-	$(DISABLE_DEPRECATED_CFLAGS)			\
+	$(DISABLE_DEPRECATED)				\
 	$(TRACKER_CFLAGS)				\
 	-DDATADIR=\""$(datadir)"\" 			\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\

nautilus-sendto-extension/Makefile.am

@@ -5,7 +5,7 @@ INCLUDES=\
 	-I$(top_builddir) \
 	$(BASE_CFLAGS) \
 	$(WARNING_CFLAGS) \
-	$(DISABLE_DEPRECATED_CFLAGS) \
+	$(DISABLE_DEPRECATED) \
 	-DDATADIR=\""$(datadir)"\" \
 	$(NULL)
 

src/Makefile.am

@@ -30,7 +30,7 @@ INCLUDES =							\
 	-DPREFIX=\""$(prefix)"\" 				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
 	-DVERSION="\"$(VERSION)\"" 				\
-	$(DISABLE_DEPRECATED_CFLAGS)                            \
+	$(DISABLE_DEPRECATED) 		                        \
 	$(NULL)
 
 LDADD =\