summaryrefslogtreecommitdiff
path: root/modules/im/ximcp
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-10-01 22:20:38 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-10-01 22:20:38 -0700
commit3bb020587ce74e0737ec7aceb20041f1e77d3b87 (patch)
tree6ca6a28d6099a09d11a74ab500fa77120157b2c8 /modules/im/ximcp
parentd54caf1c9c55af8247621b7ba6afb20b23699839 (diff)
Split CFLAGS into CPPFLAGS and CFLAGS
On some build systems, CPPFLAGS is set to "-I/some/prefix/include". If older X11 headers are in /some/prefix/include, they will be preferred over the shipped headers. This corrects that problem.
Diffstat (limited to 'modules/im/ximcp')
-rw-r--r--modules/im/ximcp/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/im/ximcp/Makefile.am b/modules/im/ximcp/Makefile.am
index 914ca3e..0dc8dfb 100644
--- a/modules/im/ximcp/Makefile.am
+++ b/modules/im/ximcp/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS= \
+AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@@ -6,10 +6,12 @@ AM_CFLAGS= \
-I$(top_srcdir)/src/xcms \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
+ -D_BSD_SOURCE -DXIM_t -DTRANS_CLIENT
+
+AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
- -D_BSD_SOURCE -DXIM_t -DTRANS_CLIENT \
$(MALLOC_ZERO_CFLAGS)
if XLIB_LOADABLE_I18N