[PATCH wayland 2/5] build: Stop putting FFI_CFLAGS in AM_CFLAGS

[Derek Foreman]

On 18/06/15 02:51 AM, Quentin Glidic wrote:
> On 2015-06-17 22:13, Derek Foreman wrote:
>> 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.
> 
> 
> Then please use $(AM_CFLAGS) everywhere $(GCC_CFLAGS) is used alone when
> overriding _CFLAGS. This way, we can easily add e.g. $(CLANG_CFLAGS) or
> other generic flags in the future.
> 
> Could be a follow-up patch.

Hmm, good point.  follow-up sent.

Thanks.

> 
>> The only thing that needs it but didn't have it specifically was
>> libwayland_util (for connection.c)
>>
>> Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
>> ---
>>  Makefile.am | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> 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)
> 
> Like here, it should be $(FFI_CFLAGS) $(AM_CFLAGS)
> 
> 
>>  libwayland_util_la_SOURCES =			\
>>  	src/connection.c			\
>>  	src/wayland-util.c			\
>>
> 
>