[PATCH wayland] build: Use AM_CFLAGS instead of GCC_CFLAGS everywhere

[Pekka Paalanen]

On Thu, 18 Jun 2015 09:59:26 -0700
"Jon A. Cruz" <jonc at osg.samsung.com> wrote:

> On 06/18/2015 09:27 AM, Derek Foreman wrote:
> > This will make it easier if we ever want to add new flags to everything
> > in the future.
> > 
> > Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> > ---
> >  Makefile.am | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/Makefile.am b/Makefile.am
> > index 845c116..58f5595 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -34,7 +34,7 @@ else
> >  wayland_scanner = wayland-scanner
> >  endif
> >  
> > -libwayland_util_la_CFLAGS = $(GCC_CFLAGS)
> > +libwayland_util_la_CFLAGS = $(AM_CFLAGS)
> >  libwayland_util_la_SOURCES =			\
> >  	src/wayland-util.c			\
> >  	src/wayland-util.h
> > @@ -65,7 +65,7 @@ nodist_include_HEADERS =			\
> >  	protocol/wayland-server-protocol.h	\
> >  	protocol/wayland-client-protocol.h
> >  
> > -libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) -pthread
> > +libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
> >  libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
> >  libwayland_server_la_LDFLAGS = -version-info 1:0:1
> >  libwayland_server_la_SOURCES =			\
> > @@ -77,7 +77,7 @@ nodist_libwayland_server_la_SOURCES =		\
> >  	protocol/wayland-server-protocol.h	\
> >  	protocol/wayland-protocol.c
> >  
> > -libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) -pthread
> > +libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
> >  libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
> >  libwayland_client_la_LDFLAGS = -version-info 3:0:3
> >  libwayland_client_la_SOURCES =			\
> > @@ -131,7 +131,7 @@ libwayland_cursor_la_LIBADD = libwayland-client.la
> >  pkgconfig_DATA += cursor/wayland-cursor.pc
> >  
> >  libwayland_cursor_la_CFLAGS =			\
> > -	$(GCC_CFLAGS)				\
> > +	$(AM_CFLAGS)				\
> >  	-I$(top_builddir)/src			\
> >  	-I$(top_srcdir)/src			\
> >  	-DICONDIR=\"$(ICONDIR)\"
> > 
> 
> Looks good. As I mentioned to Derek earlier I had just hit this in the
> documentation when checking for some other things I was adding (and
> disentangling for testing).
> 
> Reviewed-by: Jon A. Cruz <jonc at osg.samsung.com>
> 

Pushed:
   a8a8601..4cdc510  master -> master


Thanks,
pq