summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorBryce Harrington <bryce@osg.samsung.com>2016-03-16 14:15:18 -0700
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2016-03-17 14:13:13 +0200
commite99e4bf2b9aa13baae46f2a49ff9c9ed8ca631c7 (patch)
tree7a729aad4350c02a7b82f8ed7ae145d290f5a93b /Makefile.am
parent4e221f0327cbc342d78916a62ace64368471d55b (diff)
downloadweston-e99e4bf2b9aa13baae46f2a49ff9c9ed8ca631c7.tar.gz
weston-e99e4bf2b9aa13baae46f2a49ff9c9ed8ca631c7.tar.bz2
weston-e99e4bf2b9aa13baae46f2a49ff9c9ed8ca631c7.zip
clients & tests: Unify multiple definitions of x*alloc and related functions
Direct fail_on_null calls now produce output like: [weston-info] clients/weston-info.c:714: out of memory xmalloc, et al produce output on failure like: [weston-info] out of memory (-1) Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 318a8376..d1644ac5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -999,7 +999,9 @@ libshared_la_SOURCES = \
shared/file-util.h \
shared/helpers.h \
shared/os-compatibility.c \
- shared/os-compatibility.h
+ shared/os-compatibility.h \
+ shared/xalloc.c \
+ shared/xalloc.h
libshared_cairo_la_CFLAGS = \
-DDATADIR='"$(datadir)"' \