summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2015-06-17 15:13:49 -0500
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-06-18 14:06:08 +0300
commitaeeca3169663336a7719faad36a11e0716bd381b (patch)
tree2e27a433e181c6ec66e63d510d9e037ac9a29858 /Makefile.am
parentbuild: Move AM_CFLAGS and AM_CPPFLAGS to the top of Makefile.am (diff)
downloadwayland-aeeca3169663336a7719faad36a11e0716bd381b.tar
wayland-aeeca3169663336a7719faad36a11e0716bd381b.tar.gz
wayland-aeeca3169663336a7719faad36a11e0716bd381b.tar.bz2
wayland-aeeca3169663336a7719faad36a11e0716bd381b.tar.lz
wayland-aeeca3169663336a7719faad36a11e0716bd381b.tar.xz
wayland-aeeca3169663336a7719faad36a11e0716bd381b.tar.zst
wayland-aeeca3169663336a7719faad36a11e0716bd381b.zip
build: Stop putting FFI_CFLAGS in AM_CFLAGS
AM_CFLAGS are the defaults passed to anything that doesn't specify its own _CFLAGS, so instead of putting FFI_CFLAGS there, let's just add that to anything that actually needs it. The only thing that needs it but didn't have it specifically was libwayland_util (for connection.c) Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 96ad0be..34f8473 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_builddir)/protocol
-AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS)
+AM_CFLAGS = $(GCC_CFLAGS)
aclocaldir = $(datadir)/aclocal
dist_aclocal_DATA = wayland-scanner.m4
@@ -39,6 +39,7 @@ nodist_include_HEADERS = \
protocol/wayland-server-protocol.h \
protocol/wayland-client-protocol.h
+libwayland_util_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS)
libwayland_util_la_SOURCES = \
src/connection.c \
src/wayland-util.c \