summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-11-01 22:52:56 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-11-01 23:22:06 -0400
commit484a45c4b63b67fb524c033a1191e27f54782b86 (patch)
treebb03ffb6b70e22b614a208a4b58f119f47a0bf7a /modules
parent83700521808176a11200a758f5b69c1990a727d4 (diff)
downloadgtk+-484a45c4b63b67fb524c033a1191e27f54782b86.tar.gz
Drop DISABLE_DEPRECATED guards here, too
Diffstat (limited to 'modules')
-rw-r--r--modules/input/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 2ba9dcf99c..b847a19082 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 = \