[gtk+] Drop DISABLE_DEPRECATED guards here, too

[Matthias Clasen <matthiasc src gnome org>]

commit 484a45c4b63b67fb524c033a1191e27f54782b86
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Nov 1 22:52:56 2011 -0400

    Drop DISABLE_DEPRECATED guards here, too

 modules/input/Makefile.am |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 2ba9dcf..b847a19 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -5,12 +5,10 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED 	\
 	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_XIM_FLAGS)		\
 	$(GTK_DEP_CFLAGS)		\
@@ -153,7 +151,7 @@ endif
 endif
 
 multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
-im_multipress_la_CPPFLAGS = $(multipress_defs)
+im_multipress_la_CPPFLAGS = $(AM_CPPFLAGS) $(multipress_defs)
 libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
 im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_multipress_la_SOURCES =	\