src: Don't add COMPOSITOR_CFLAGS to AM_CPPFLAGS

It's a CFLAGS variable, not CPPFLAGS and we don't want to add it to every
target.  In particular we don't want anything leaking into weston-launch.

diff --git a/src/Makefile.am b/src/Makefile.am
index 11eade9..b6bde4f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,15 +5,13 @@ AM_CPPFLAGS =                                 \
        -DDATADIR='"$(datadir)"'                \
        -DMODULEDIR='"$(moduledir)"'            \
        -DLIBEXECDIR='"$(libexecdir)"'          \
-       -DXSERVER_PATH='"@XSERVER_PATH@"'       \
-       $(COMPOSITOR_CFLAGS)
+       -DXSERVER_PATH='"@XSERVER_PATH@"'
 
 weston_LDFLAGS = -export-dynamic
-weston_CFLAGS = $(GCC_CFLAGS)
-weston_LDADD =                                                         \
-       $(COMPOSITOR_LIBS) $(DLOPEN_LIBS) -lm ../shared/libshared.la
+weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
+weston_LDADD = $(COMPOSITOR_LIBS) $(DLOPEN_LIBS) -lm ../shared/libshared.la
 
-weston_SOURCES =                       \
+weston_SOURCES =                               \
        compositor.c                            \
        compositor.h                            \
        screenshooter.c                         \
@@ -64,7 +62,10 @@ x11_backend = x11-backend.la
 x11_backend_la_LDFLAGS = -module -avoid-version
 x11_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(X11_COMPOSITOR_LIBS) \
        ../shared/libshared.la
-x11_backend_la_CFLAGS = $(X11_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
+x11_backend_la_CFLAGS =                                \
+       $(COMPOSITOR_CFLAGS)                    \
+       $(X11_COMPOSITOR_CFLAGS)                \
+       $(GCC_CFLAGS)
 x11_backend_la_SOURCES = compositor-x11.c
 endif
 
@@ -73,7 +74,10 @@ drm_backend = drm-backend.la
 drm_backend_la_LDFLAGS = -module -avoid-version
 drm_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(DRM_COMPOSITOR_LIBS) \
        ../shared/libshared.la
-drm_backend_la_CFLAGS = $(DRM_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
+drm_backend_la_CFLAGS =                                \
+       $(COMPOSITOR_CFLAGS)                    \
+       $(DRM_COMPOSITOR_CFLAGS)                \
+       $(GCC_CFLAGS)
 drm_backend_la_SOURCES =                       \
        compositor-drm.c                        \
        tty.c                                   \
@@ -90,7 +94,10 @@ wayland_backend = wayland-backend.la
 wayland_backend_la_LDFLAGS = -module -avoid-version
 wayland_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(WAYLAND_COMPOSITOR_LIBS) \
        ../shared/libshared.la
-wayland_backend_la_CFLAGS = $(WAYLAND_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
+wayland_backend_la_CFLAGS =                    \
+       $(COMPOSITOR_CFLAGS)                    \
+       $(WAYLAND_COMPOSITOR_CFLAGS)            \
+       $(GCC_CFLAGS)
 wayland_backend_la_SOURCES = compositor-wayland.c
 endif
 
@@ -106,7 +113,7 @@ if ENABLE_XSERVER_LAUNCHER
 xserver_launcher = xserver-launcher.la
 xserver_launcher_la_LDFLAGS = -module -avoid-version
 xserver_launcher_la_LIBADD = $(XSERVER_LAUNCHER_LIBS)
-xserver_launcher_la_CFLAGS = $(GCC_CFLAGS)
+xserver_launcher_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
 xserver_launcher_la_SOURCES =                  \
        xserver-launcher.c                      \
        xserver-protocol.c                      \
@@ -120,7 +127,7 @@ desktop_shell = desktop-shell.la
 desktop_shell_la_LDFLAGS = -module -avoid-version
 desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS)   \
        ../shared/libshared.la
-desktop_shell_la_CFLAGS = $(GCC_CFLAGS)
+desktop_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
 desktop_shell_la_SOURCES =                     \
        shell.c                                 \
        desktop-shell-protocol.c                \
@@ -131,7 +138,7 @@ if ENABLE_TABLET_SHELL
 tablet_shell = tablet-shell.la
 tablet_shell_la_LDFLAGS = -module -avoid-version
 tablet_shell_la_LIBADD = $(COMPOSITOR_LIBS)
-tablet_shell_la_CFLAGS = $(GCC_CFLAGS)
+tablet_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
 tablet_shell_la_SOURCES =                      \
        tablet-shell.c                          \
        tablet-shell-protocol.c                 \