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 <[email protected]> > --- > 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 > cms_static_la_LIBADD = $(COMPOSITOR_LIBS) $(LCMS_LIBS) libshared.la > -cms_static_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LCMS_CFLAGS) > +cms_static_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LCMS_CFLAGS) > cms_static_la_SOURCES = \ > src/cms-static.c \ > src/cms-helper.c \ > @@ -364,7 +364,7 @@ if ENABLE_COLORD > module_LTLIBRARIES += cms-colord.la > cms_colord_la_LDFLAGS = -module -avoid-version > cms_colord_la_LIBADD = $(COMPOSITOR_LIBS) $(COLORD_LIBS) > -cms_colord_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(COLORD_CFLAGS) > +cms_colord_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(COLORD_CFLAGS) > cms_colord_la_SOURCES = \ > src/cms-colord.c \ > src/cms-helper.c \ > @@ -373,7 +373,7 @@ endif > endif > > noinst_PROGRAMS += spring-tool > -spring_tool_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +spring_tool_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > spring_tool_LDADD = $(COMPOSITOR_LIBS) -lm > spring_tool_SOURCES = \ > src/spring-tool.c \ > @@ -740,7 +740,7 @@ wcap_decode_SOURCES = \ > wcap/wcap-decode.c \ > wcap/wcap-decode.h > > -wcap_decode_CFLAGS = $(GCC_CFLAGS) $(WCAP_CFLAGS) > +wcap_decode_CFLAGS = $(AM_CFLAGS) $(WCAP_CFLAGS) > wcap_decode_LDADD = $(WCAP_LIBS) > endif > > @@ -762,7 +762,7 @@ desktop_shell_la_CPPFLAGS = \ > > desktop_shell_la_LDFLAGS = -module -avoid-version > desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la > -desktop_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +desktop_shell_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > desktop_shell_la_SOURCES = \ > desktop-shell/shell.h \ > desktop-shell/shell.c \ > @@ -790,7 +790,7 @@ fullscreen_shell_la_CPPFLAGS = \ > > fullscreen_shell_la_LDFLAGS = -module -avoid-version > fullscreen_shell_la_LIBADD = $(COMPOSITOR_LIBS) > -fullscreen_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +fullscreen_shell_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > fullscreen_shell_la_SOURCES = \ > fullscreen-shell/fullscreen-shell.c > nodist_fullscreen_shell_la_SOURCES = \ > @@ -809,7 +809,7 @@ module_LTLIBRARIES += \ > ivi_shell = ivi-shell.la > ivi_shell_la_LDFLAGS = -module -avoid-version > ivi_shell_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la > -ivi_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +ivi_shell_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > ivi_shell_la_SOURCES = \ > ivi-shell/ivi-layout-export.h \ > ivi-shell/ivi-layout-private.h \ > @@ -827,7 +827,7 @@ BUILT_SOURCES += $(nodist_ivi_shell_la_SOURCES) > hmi_controller = hmi-controller.la > hmi_controller_la_LDFLAGS = -module -avoid-version > hmi_controller_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la > -hmi_controller_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +hmi_controller_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > hmi_controller_la_SOURCES = \ > ivi-shell/ivi-layout-export.h \ > ivi-shell/hmi-controller.c > @@ -853,7 +853,7 @@ screen_share_la_LIBADD = \ > screen_share_la_CFLAGS = \ > $(COMPOSITOR_CFLAGS) \ > $(SCREEN_SHARE_CFLAGS) \ > - $(GCC_CFLAGS) > + $(AM_CFLAGS) > screen_share_la_SOURCES = \ > src/screen-share.c > nodist_screen_share_la_SOURCES = \ > @@ -882,7 +882,7 @@ xwayland_la_LIBADD = \ > $(XWAYLAND_LIBS) \ > $(top_builddir)/libshared-cairo.la > xwayland_la_CFLAGS = \ > - $(GCC_CFLAGS) \ > + $(AM_CFLAGS) \ > $(COMPOSITOR_CFLAGS) \ > $(PIXMAN_CFLAGS) \ > $(CAIRO_CFLAGS) > @@ -903,7 +903,7 @@ endif > > noinst_LTLIBRARIES += libshared.la libshared-cairo.la > > -libshared_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +libshared_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > > libshared_la_SOURCES = \ > shared/config-parser.c \ > @@ -916,7 +916,7 @@ libshared_la_SOURCES = \ > > libshared_cairo_la_CFLAGS = \ > -DDATADIR='"$(datadir)"' \ > - $(GCC_CFLAGS) \ > + $(AM_CFLAGS) \ > $(COMPOSITOR_CFLAGS) \ > $(PIXMAN_CFLAGS) \ > $(CAIRO_CFLAGS) \ > @@ -1004,15 +1004,15 @@ test_module_ldflags = \ > > surface_global_test_la_SOURCES = tests/surface-global-test.c > surface_global_test_la_LDFLAGS = $(test_module_ldflags) > -surface_global_test_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +surface_global_test_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > > surface_test_la_SOURCES = tests/surface-test.c > surface_test_la_LDFLAGS = $(test_module_ldflags) > -surface_test_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +surface_test_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > > weston_test_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la > weston_test_la_LDFLAGS = $(test_module_ldflags) > -weston_test_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +weston_test_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > weston_test_la_SOURCES = tests/weston-test.c > nodist_weston_test_la_SOURCES = \ > protocol/weston-test-protocol.c \ > @@ -1026,7 +1026,7 @@ endif > libtest_runner_la_SOURCES = \ > tests/weston-test-runner.c \ > tests/weston-test-runner.h > -libtest_runner_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +libtest_runner_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > > config_parser_test_SOURCES = tests/config-parser-test.c > config_parser_test_LDADD = libshared.la libtest-runner.la $(COMPOSITOR_LIBS) > @@ -1105,14 +1105,14 @@ roles_weston_LDADD = libtest-client.la > if ENABLE_EGL > weston_tests += buffer-count.weston > buffer_count_weston_SOURCES = tests/buffer-count-test.c > -buffer_count_weston_CFLAGS = $(GCC_CFLAGS) $(EGL_TESTS_CFLAGS) > +buffer_count_weston_CFLAGS = $(AM_CFLAGS) $(EGL_TESTS_CFLAGS) > buffer_count_weston_LDADD = libtest-client.la $(EGL_TESTS_LIBS) > endif > > if ENABLE_XWAYLAND_TEST > weston_tests += xwayland-test.weston > xwayland_test_weston_SOURCES = tests/xwayland-test.c > -xwayland_test_weston_CFLAGS = $(GCC_CFLAGS) $(XWAYLAND_TEST_CFLAGS) > +xwayland_test_weston_CFLAGS = $(AM_CFLAGS) $(XWAYLAND_TEST_CFLAGS) > xwayland_test_weston_LDADD = libtest-client.la $(XWAYLAND_TEST_LIBS) > endif > > @@ -1130,13 +1130,13 @@ module_tests += \ > > ivi_layout_internal_test_la_LIBADD = $(COMPOSITOR_LIBS) > ivi_layout_internal_test_la_LDFLAGS = $(test_module_ldflags) > -ivi_layout_internal_test_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +ivi_layout_internal_test_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > ivi_layout_internal_test_la_SOURCES = \ > tests/ivi_layout-internal-test.c > > ivi_layout_test_la_LIBADD = $(COMPOSITOR_LIBS) > ivi_layout_test_la_LDFLAGS = $(test_module_ldflags) > -ivi_layout_test_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +ivi_layout_test_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > ivi_layout_test_la_SOURCES = \ > tests/ivi_layout-test-plugin.c \ > tests/ivi-test.h > @@ -1213,7 +1213,7 @@ noinst_LTLIBRARIES += \ > > surface_screenshot_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la > surface_screenshot_la_LDFLAGS = $(test_module_ldflags) > -surface_screenshot_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) > +surface_screenshot_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) > surface_screenshot_la_SOURCES = tests/surface-screenshot.c > > >
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 <[email protected]> -- Jon A. Cruz - Senior Open Source Developer Samsung Open Source Group [email protected] _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
