Re: [PATCH weston] build: Use AM_CFLAGS instead of GCC_CFLAGS
On Thu, 18 Jun 2015 09:59:42 -0700 Jon A. Cruz j...@osg.samsung.com wrote: On 06/18/2015 09:43 AM, Derek Foreman wrote: AM_CFLAGS is the default for any target that doesn't specify its own cflags. We should use AM_CFLAGS in preference to GCC_CFLAGS so we can change AM_CFLAGS and get all targets. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 64 ++--- 1 file changed, 32 insertions(+), 32 deletions(-) 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 j...@osg.samsung.com This one had some conflicts with Added new include file to all SOURCES variables with files that use it. but I think I sorted them out. Pushed: b37ac40..4ff3874 master - master Thanks, pq ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH weston] build: Use AM_CFLAGS instead of GCC_CFLAGS
AM_CFLAGS is the default for any target that doesn't specify its own cflags. We should use AM_CFLAGS in preference to GCC_CFLAGS so we can change AM_CFLAGS and get all targets. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 64 ++--- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Makefile.am b/Makefile.am index 261798c..f0f19cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ bin_PROGRAMS += weston weston_LDFLAGS = -export-dynamic weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON -weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) +weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ $(DLOPEN_LIBS) -lm libshared.la @@ -123,7 +123,7 @@ libsession_helper_la_SOURCES = \ src/weston-launch.h \ src/launcher-util.c \ src/launcher-util.h -libsession_helper_la_CFLAGS = $(GCC_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS) +libsession_helper_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS) libsession_helper_la_LIBADD = $(LIBDRM_LIBS) if ENABLE_DBUS @@ -154,7 +154,7 @@ bin_PROGRAMS += weston-launch weston_launch_SOURCES = src/weston-launch.c src/weston-launch.h weston_launch_CPPFLAGS = -DBINDIR='$(bindir)' weston_launch_CFLAGS= \ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ $(PAM_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(LIBDRM_CFLAGS) @@ -200,7 +200,7 @@ gl_renderer_la_LIBADD = $(COMPOSITOR_LIBS) $(EGL_LIBS) gl_renderer_la_CFLAGS =\ $(COMPOSITOR_CFLAGS)\ $(EGL_CFLAGS) \ - $(GCC_CFLAGS) + $(AM_CFLAGS) gl_renderer_la_SOURCES = \ src/gl-renderer.h \ src/gl-renderer.c \ @@ -219,7 +219,7 @@ x11_backend_la_CFLAGS = \ $(PIXMAN_CFLAGS)\ $(CAIRO_CFLAGS) \ $(X11_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) x11_backend_la_SOURCES = src/compositor-x11.c endif @@ -243,7 +243,7 @@ drm_backend_la_CFLAGS = \ $(COMPOSITOR_CFLAGS)\ $(EGL_CFLAGS) \ $(DRM_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) drm_backend_la_SOURCES = \ src/compositor-drm.c\ $(INPUT_BACKEND_SOURCES)\ @@ -270,7 +270,7 @@ wayland_backend_la_CFLAGS = \ $(PIXMAN_CFLAGS)\ $(CAIRO_CFLAGS) \ $(WAYLAND_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) wayland_backend_la_SOURCES = src/compositor-wayland.c nodist_wayland_backend_la_SOURCES =\ protocol/fullscreen-shell-protocol.c\ @@ -292,7 +292,7 @@ rpi_backend_la_LIBADD = $(COMPOSITOR_LIBS) \ libsession-helper.la\ libshared.la rpi_backend_la_CFLAGS =\ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ $(COMPOSITOR_CFLAGS)\ $(RPI_COMPOSITOR_CFLAGS)\ $(RPI_BCM_HOST_CFLAGS) @@ -314,7 +314,7 @@ if ENABLE_HEADLESS_COMPOSITOR module_LTLIBRARIES += headless-backend.la headless_backend_la_LDFLAGS = -module -avoid-version headless_backend_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la -headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(GCC_CFLAGS) +headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(AM_CFLAGS) headless_backend_la_SOURCES = src/compositor-headless.c endif @@ -332,7 +332,7 @@ fbdev_backend_la_CFLAGS = \ $(EGL_CFLAGS) \ $(FBDEV_COMPOSITOR_CFLAGS) \ $(PIXMAN_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) fbdev_backend_la_SOURCES = \ src/compositor-fbdev.c \ $(INPUT_BACKEND_SOURCES) @@ -347,7 +347,7 @@ rdp_backend_la_LIBADD = $(COMPOSITOR_LIBS) \ rdp_backend_la_CFLAGS =\ $(COMPOSITOR_CFLAGS)\ $(RDP_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) rdp_backend_la_SOURCES = src/compositor-rdp.c endif @@ -355,7 +355,7 @@ if HAVE_LCMS module_LTLIBRARIES += cms-static.la cms_static_la_LDFLAGS = -module -avoid-version
Re: [PATCH weston] build: Use AM_CFLAGS instead of GCC_CFLAGS
On 06/18/2015 09:43 AM, Derek Foreman wrote: AM_CFLAGS is the default for any target that doesn't specify its own cflags. We should use AM_CFLAGS in preference to GCC_CFLAGS so we can change AM_CFLAGS and get all targets. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 64 ++--- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Makefile.am b/Makefile.am index 261798c..f0f19cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ bin_PROGRAMS += weston weston_LDFLAGS = -export-dynamic weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON -weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) +weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ $(DLOPEN_LIBS) -lm libshared.la @@ -123,7 +123,7 @@ libsession_helper_la_SOURCES =\ src/weston-launch.h \ src/launcher-util.c \ src/launcher-util.h -libsession_helper_la_CFLAGS = $(GCC_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS) +libsession_helper_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS) libsession_helper_la_LIBADD = $(LIBDRM_LIBS) if ENABLE_DBUS @@ -154,7 +154,7 @@ bin_PROGRAMS += weston-launch weston_launch_SOURCES = src/weston-launch.c src/weston-launch.h weston_launch_CPPFLAGS = -DBINDIR='$(bindir)' weston_launch_CFLAGS=\ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ $(PAM_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(LIBDRM_CFLAGS) @@ -200,7 +200,7 @@ gl_renderer_la_LIBADD = $(COMPOSITOR_LIBS) $(EGL_LIBS) gl_renderer_la_CFLAGS = \ $(COMPOSITOR_CFLAGS)\ $(EGL_CFLAGS) \ - $(GCC_CFLAGS) + $(AM_CFLAGS) gl_renderer_la_SOURCES = \ src/gl-renderer.h \ src/gl-renderer.c \ @@ -219,7 +219,7 @@ x11_backend_la_CFLAGS = \ $(PIXMAN_CFLAGS)\ $(CAIRO_CFLAGS) \ $(X11_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) x11_backend_la_SOURCES = src/compositor-x11.c endif @@ -243,7 +243,7 @@ drm_backend_la_CFLAGS = \ $(COMPOSITOR_CFLAGS)\ $(EGL_CFLAGS) \ $(DRM_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) drm_backend_la_SOURCES = \ src/compositor-drm.c\ $(INPUT_BACKEND_SOURCES)\ @@ -270,7 +270,7 @@ wayland_backend_la_CFLAGS = \ $(PIXMAN_CFLAGS)\ $(CAIRO_CFLAGS) \ $(WAYLAND_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) wayland_backend_la_SOURCES = src/compositor-wayland.c nodist_wayland_backend_la_SOURCES = \ protocol/fullscreen-shell-protocol.c\ @@ -292,7 +292,7 @@ rpi_backend_la_LIBADD = $(COMPOSITOR_LIBS)\ libsession-helper.la\ libshared.la rpi_backend_la_CFLAGS = \ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ $(COMPOSITOR_CFLAGS)\ $(RPI_COMPOSITOR_CFLAGS)\ $(RPI_BCM_HOST_CFLAGS) @@ -314,7 +314,7 @@ if ENABLE_HEADLESS_COMPOSITOR module_LTLIBRARIES += headless-backend.la headless_backend_la_LDFLAGS = -module -avoid-version headless_backend_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la -headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(GCC_CFLAGS) +headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(AM_CFLAGS) headless_backend_la_SOURCES = src/compositor-headless.c endif @@ -332,7 +332,7 @@ fbdev_backend_la_CFLAGS = \ $(EGL_CFLAGS) \ $(FBDEV_COMPOSITOR_CFLAGS) \ $(PIXMAN_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) fbdev_backend_la_SOURCES = \ src/compositor-fbdev.c \ $(INPUT_BACKEND_SOURCES) @@ -347,7 +347,7 @@ rdp_backend_la_LIBADD = $(COMPOSITOR_LIBS) \ rdp_backend_la_CFLAGS = \ $(COMPOSITOR_CFLAGS)\ $(RDP_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) rdp_backend_la_SOURCES = src/compositor-rdp.c endif @@ -355,7 +355,7 @@ if HAVE_LCMS module_LTLIBRARIES +=
