From 4cdc51034c83771fcde1fdf39beee8aa582dbb8c Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 18 Jun 2015 11:27:21 -0500 Subject: [PATCH] build: Use AM_CFLAGS instead of GCC_CFLAGS everywhere This will make it easier if we ever want to add new flags to everything in the future. Signed-off-by: Derek Foreman Reviewed-by: Jon A. Cruz Reviewed-by: Pekka Paalanen --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 845c1167..58f55953 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)\"