build: Stop putting FFI_CFLAGS in AM_CFLAGS
authorDerek Foreman <derekf@osg.samsung.com>
Wed, 17 Jun 2015 20:13:49 +0000 (15:13 -0500)
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>
Thu, 18 Jun 2015 11:06:08 +0000 (14:06 +0300)
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>
Makefile.am

index 96ad0be..34f8473 100644 (file)
@@ -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                      \