summaryrefslogtreecommitdiff
path: root/src/util/Makefile.am
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2011-09-22 18:44:13 -0400
committerDaniel Stone <daniel@fooishbar.org>2011-11-11 00:36:57 +0000
commit24283d40b1e4314c6647dda49d2a159833341a8b (patch)
tree4dda8eb0fcba5040a7b151a6bf050c518a701c37 /src/util/Makefile.am
parent1c41f3b9b86b5eeedfa3bff92e519d45aa097587 (diff)
makekeys: Fix build/target word size mismatch when cross-compiling
Since makekeys is built using build environment's gcc and runs natively, we have to make sure that the size of the Signature type is the same on both the native environment and the target, otherwise we get mismatches upon running X, and some LSB test failures (xts5). Use an unsigned 32-bit integer on all platforms. Also, eliminate the redundant multiple typedefs for the Signature type. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'src/util/Makefile.am')
-rw-r--r--src/util/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 3b100e00..dfe91f1a 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -5,6 +5,9 @@ makekeys_CFLAGS = \
$(X11_CFLAGS) \
$(CWARNFLAGS)
+makekeys_CPPFLAGS = \
+ -I$(top_srcdir)/include
+
CC = @CC_FOR_BUILD@
CPPFLAGS = @CPPFLAGS_FOR_BUILD@
CFLAGS = @CFLAGS_FOR_BUILD@