downstream: allow regular users to launch Weston
[platform/upstream/weston.git] / Makefile.am
index 6eab511..b2d6893 100644 (file)
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 bin_PROGRAMS =
 noinst_PROGRAMS =
 libexec_PROGRAMS =
@@ -6,7 +8,8 @@ module_LTLIBRARIES =
 noinst_LTLIBRARIES =
 BUILT_SOURCES =
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
+# Do not run xwayland test while it is known broken.
+AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install --disable-xwayland-test
 
 EXTRA_DIST = weston.ini.in
 
@@ -50,8 +53,6 @@ weston_SOURCES =                                      \
        src/compositor.h                                \
        src/input.c                                     \
        src/data-device.c                               \
-       src/filter.c                                    \
-       src/filter.h                                    \
        src/screenshooter.c                             \
        src/clipboard.c                                 \
        src/zoom.c                                      \
@@ -113,6 +114,10 @@ endif
 if HAVE_GIT_REPO
 src/git-version.h : $(top_srcdir)/.git/logs/HEAD
        $(AM_V_GEN)echo "#define BUILD_ID \"$(shell git --git-dir=$(top_srcdir)/.git describe --always --dirty) $(shell git --git-dir=$(top_srcdir)/.git log -1 --format='%s (%ci)')\"" > $@
+else
+src/git-version.h :
+       $(AM_V_GEN)echo "#define BUILD_ID \"unknown (not built from git or tarball)\"" > $@
+
 endif
 
 .FORCE :
@@ -177,12 +182,33 @@ x11_backend_la_CFLAGS =                           \
 x11_backend_la_SOURCES = src/compositor-x11.c
 endif
 
+INPUT_BACKEND_SOURCES = src/udev-input.h
+
+if ENABLE_LIBINPUT_BACKEND
+INPUT_BACKEND_LIBS = $(LIBINPUT_BACKEND_LIBS)
+INPUT_BACKEND_SOURCES +=                       \
+       src/libinput-seat.c                     \
+       src/libinput-seat.h                     \
+       src/libinput-device.c                   \
+       src/libinput-device.h
+else
+INPUT_BACKEND_SOURCES +=                       \
+       src/filter.c                            \
+       src/filter.h                            \
+       src/udev-seat.c                         \
+       src/udev-seat.h                         \
+       src/evdev.c                             \
+       src/evdev.h                             \
+       src/evdev-touchpad.c
+endif
+
 if ENABLE_DRM_COMPOSITOR
 module_LTLIBRARIES += drm-backend.la
 drm_backend_la_LDFLAGS = -module -avoid-version
 drm_backend_la_LIBADD =                                \
        $(COMPOSITOR_LIBS)                      \
        $(DRM_COMPOSITOR_LIBS)                  \
+       $(INPUT_BACKEND_LIBS)                   \
        libshared.la -lrt                       \
        libsession-helper.la
 drm_backend_la_CFLAGS =                                \
@@ -192,11 +218,7 @@ drm_backend_la_CFLAGS =                            \
        $(GCC_CFLAGS)
 drm_backend_la_SOURCES =                       \
        src/compositor-drm.c                    \
-       src/udev-seat.c                         \
-       src/udev-seat.h                         \
-       src/evdev.c                             \
-       src/evdev.h                             \
-       src/evdev-touchpad.c                    \
+       $(INPUT_BACKEND_SOURCES)                \
        src/libbacklight.c                      \
        src/libbacklight.h
 
@@ -222,6 +244,9 @@ wayland_backend_la_CFLAGS =                 \
        $(WAYLAND_COMPOSITOR_CFLAGS)            \
        $(GCC_CFLAGS)
 wayland_backend_la_SOURCES = src/compositor-wayland.c
+nodist_wayland_backend_la_SOURCES =                    \
+       protocol/fullscreen-shell-protocol.c            \
+       protocol/fullscreen-shell-client-protocol.h
 endif
 
 if ENABLE_RPI_COMPOSITOR
@@ -235,6 +260,7 @@ rpi_backend_la_LDFLAGS = -module -avoid-version
 rpi_backend_la_LIBADD = $(COMPOSITOR_LIBS)     \
        $(RPI_COMPOSITOR_LIBS)                  \
        $(RPI_BCM_HOST_LIBS)                    \
+       $(INPUT_BACKEND_LIBS)                   \
        libsession-helper.la                    \
        libshared.la
 rpi_backend_la_CFLAGS =                                \
@@ -247,11 +273,7 @@ rpi_backend_la_SOURCES =                   \
        src/rpi-renderer.c                      \
        src/rpi-renderer.h                      \
        src/rpi-bcm-stubs.h                     \
-       src/udev-seat.c                         \
-       src/udev-seat.h                         \
-       src/evdev.c                             \
-       src/evdev.h                             \
-       src/evdev-touchpad.c
+       $(INPUT_BACKEND_SOURCES)
 
 if ENABLE_EGL
 rpi_backend_la_LIBADD += $(EGL_LIBS)
@@ -263,11 +285,8 @@ endif
 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_LIBADD = $(COMPOSITOR_LIBS) libshared.la
+headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
 headless_backend_la_SOURCES = src/compositor-headless.c
 endif
 
@@ -277,6 +296,7 @@ fbdev_backend_la_LDFLAGS = -module -avoid-version
 fbdev_backend_la_LIBADD =                      \
        $(COMPOSITOR_LIBS)                      \
        $(FBDEV_COMPOSITOR_LIBS)                \
+       $(INPUT_BACKEND_LIBS)                   \
        libsession-helper.la                    \
        libshared.la
 fbdev_backend_la_CFLAGS =                      \
@@ -287,11 +307,7 @@ fbdev_backend_la_CFLAGS =                  \
        $(GCC_CFLAGS)
 fbdev_backend_la_SOURCES =                     \
        src/compositor-fbdev.c                  \
-       src/udev-seat.c                         \
-       src/udev-seat.h                         \
-       src/evdev.c                             \
-       src/evdev.h                             \
-       src/evdev-touchpad.c
+       $(INPUT_BACKEND_SOURCES)
 endif
 
 if ENABLE_RDP_COMPOSITOR
@@ -373,35 +389,46 @@ endif
 if BUILD_SIMPLE_CLIENTS
 demo_clients +=                                        \
        weston-simple-shm                       \
+       weston-simple-damage                    \
        weston-simple-touch                     \
        weston-multi-resource
 
-weston_simple_shm_SOURCES =                    \
-       clients/simple-shm.c                    \
-       shared/os-compatibility.c               \
-       shared/os-compatibility.h
-weston_simple_shm_CPPFLAGS = $(SIMPLE_CLIENT_CFLAGS)
-weston_simple_shm_LDADD = $(SIMPLE_CLIENT_LIBS)
-
-weston_simple_touch_SOURCES =                  \
-       clients/simple-touch.c                  \
-       shared/os-compatibility.c               \
-       shared/os-compatibility.h
-weston_simple_touch_CPPFLAGS = $(SIMPLE_CLIENT_CFLAGS)
-weston_simple_touch_LDADD = $(SIMPLE_CLIENT_LIBS)
-
-weston_multi_resource_SOURCES =                        \
-       clients/multi-resource.c                \
-       shared/os-compatibility.c               \
-       shared/os-compatibility.h
-weston_multi_resource_CPPFLAGS = $(SIMPLE_CLIENT_CFLAGS)
-weston_multi_resource_LDADD = $(SIMPLE_CLIENT_LIBS) -lm
+weston_simple_shm_SOURCES = clients/simple-shm.c
+nodist_weston_simple_shm_SOURCES =             \
+       protocol/xdg-shell-protocol.c           \
+       protocol/xdg-shell-client-protocol.h    \
+       protocol/fullscreen-shell-protocol.c    \
+       protocol/fullscreen-shell-client-protocol.h
+weston_simple_shm_CFLAGS = $(AM_CFLAGS) $(SIMPLE_CLIENT_CFLAGS)
+weston_simple_shm_LDADD = $(SIMPLE_CLIENT_LIBS) libshared.la
+
+weston_simple_damage_SOURCES = clients/simple-damage.c
+nodist_weston_simple_damage_SOURCES =          \
+       protocol/scaler-protocol.c              \
+       protocol/scaler-client-protocol.h       \
+       protocol/xdg-shell-protocol.c           \
+       protocol/xdg-shell-client-protocol.h    \
+       protocol/fullscreen-shell-protocol.c    \
+       protocol/fullscreen-shell-client-protocol.h
+weston_simple_damage_CFLAGS = $(AM_CFLAGS) $(SIMPLE_CLIENT_CFLAGS)
+weston_simple_damage_LDADD = $(SIMPLE_CLIENT_LIBS) libshared.la
+
+weston_simple_touch_SOURCES = clients/simple-touch.c
+weston_simple_touch_CFLAGS = $(AM_CFLAGS) $(SIMPLE_CLIENT_CFLAGS)
+weston_simple_touch_LDADD = $(SIMPLE_CLIENT_LIBS) libshared.la
+
+weston_multi_resource_SOURCES = clients/multi-resource.c
+weston_multi_resource_CFLAGS = $(AM_CFLAGS) $(SIMPLE_CLIENT_CFLAGS)
+weston_multi_resource_LDADD = $(SIMPLE_CLIENT_LIBS) libshared.la -lm
 endif
 
 if BUILD_SIMPLE_EGL_CLIENTS
 demo_clients += weston-simple-egl
 weston_simple_egl_SOURCES = clients/simple-egl.c
-weston_simple_egl_CPPFLAGS = $(SIMPLE_EGL_CLIENT_CFLAGS)
+nodist_weston_simple_egl_SOURCES =             \
+       protocol/xdg-shell-protocol.c           \
+       protocol/xdg-shell-client-protocol.h
+weston_simple_egl_CFLAGS = $(AM_CFLAGS) $(SIMPLE_EGL_CLIENT_CFLAGS)
 weston_simple_egl_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm
 endif
 
@@ -428,91 +455,99 @@ libtoytoolkit_la_LIBADD =                 \
        $(CLIENT_LIBS)                          \
        $(CAIRO_EGL_LIBS)                       \
        libshared-cairo.la -lrt -lm
-libtoytoolkit_la_CFLAGS = $(CLIENT_CFLAGS) $(CAIRO_EGL_CFLAGS)
+libtoytoolkit_la_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) $(CAIRO_EGL_CFLAGS)
 
 weston_flower_SOURCES = clients/flower.c
 weston_flower_LDADD = libtoytoolkit.la
-weston_flower_CFLAGS = $(CLIENT_CFLAGS)
+weston_flower_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_screenshooter_SOURCES =                         \
-       clients/screenshot.c                            \
-       shared/os-compatibility.c                       \
-       shared/os-compatibility.h
+       clients/screenshot.c
 nodist_weston_screenshooter_SOURCES =                  \
        protocol/screenshooter-protocol.c               \
        protocol/screenshooter-client-protocol.h
-weston_screenshooter_LDADD = $(CLIENT_LIBS)
-weston_screenshooter_CFLAGS = $(CLIENT_CFLAGS)
+weston_screenshooter_LDADD = $(CLIENT_LIBS) libshared.la
+weston_screenshooter_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_terminal_SOURCES = clients/terminal.c
 weston_terminal_LDADD = libtoytoolkit.la -lutil
-weston_terminal_CFLAGS = $(CLIENT_CFLAGS)
+weston_terminal_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_image_SOURCES = clients/image.c
 weston_image_LDADD = libtoytoolkit.la
-weston_image_CFLAGS = $(CLIENT_CFLAGS)
+weston_image_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
-weston_cliptest_SOURCES = clients/cliptest.c
-weston_cliptest_CFLAGS = $(AM_CPPFLAGS) $(CLIENT_CFLAGS)
+weston_cliptest_SOURCES =                              \
+       clients/cliptest.c                              \
+       src/vertex-clipping.c                           \
+       src/vertex-clipping.h
+weston_cliptest_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 weston_cliptest_LDADD = libtoytoolkit.la
 
 weston_dnd_SOURCES = clients/dnd.c
 weston_dnd_LDADD = libtoytoolkit.la
-weston_dnd_CFLAGS = $(CLIENT_CFLAGS)
+weston_dnd_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_smoke_SOURCES = clients/smoke.c
 weston_smoke_LDADD = libtoytoolkit.la
-weston_smoke_CFLAGS = $(CLIENT_CFLAGS)
+weston_smoke_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_resizor_SOURCES = clients/resizor.c
 weston_resizor_LDADD = libtoytoolkit.la
-weston_resizor_CFLAGS = $(CLIENT_CFLAGS)
+weston_resizor_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_scaler_SOURCES = clients/scaler.c
 weston_scaler_LDADD = libtoytoolkit.la
-weston_scaler_CFLAGS = $(CLIENT_CFLAGS)
+weston_scaler_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 if HAVE_CAIRO_GLESV2
 demo_clients += weston-nested weston-nested-client
 
 weston_nested_SOURCES = clients/nested.c
 weston_nested_LDADD = libtoytoolkit.la $(SERVER_LIBS)
-weston_nested_CFLAGS = $(CLIENT_CFLAGS)
+weston_nested_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_nested_client_SOURCES = clients/nested-client.c
 weston_nested_client_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm
+weston_nested_client_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 endif
 
 weston_eventdemo_SOURCES = clients/eventdemo.c
 weston_eventdemo_LDADD = libtoytoolkit.la
-weston_eventdemo_CFLAGS = $(CLIENT_CFLAGS)
+weston_eventdemo_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_clickdot_SOURCES = clients/clickdot.c
 weston_clickdot_LDADD = libtoytoolkit.la
-weston_clickdot_CFLAGS = $(CLIENT_CFLAGS)
+weston_clickdot_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_transformed_SOURCES = clients/transformed.c
 weston_transformed_LDADD = libtoytoolkit.la
-weston_transformed_CFLAGS = $(CLIENT_CFLAGS)
+weston_transformed_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_fullscreen_SOURCES = clients/fullscreen.c
+nodist_weston_fullscreen_SOURCES =                     \
+       protocol/fullscreen-shell-protocol.c            \
+       protocol/fullscreen-shell-client-protocol.h
 weston_fullscreen_LDADD = libtoytoolkit.la
-weston_fullscreen_CFLAGS = $(CLIENT_CFLAGS)
+weston_fullscreen_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_stacking_SOURCES = clients/stacking.c
 weston_stacking_LDADD = libtoytoolkit.la
-weston_stacking_CFLAGS = $(CLIENT_CFLAGS)
+weston_stacking_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_calibrator_SOURCES = clients/calibrator.c       \
        shared/matrix.c                                 \
        shared/matrix.h
 weston_calibrator_LDADD = libtoytoolkit.la
-weston_calibrator_CFLAGS = $(CLIENT_CFLAGS)
+weston_calibrator_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 if BUILD_SUBSURFACES_CLIENT
 demo_clients += weston-subsurfaces
 weston_subsurfaces_SOURCES = clients/subsurfaces.c
-weston_subsurfaces_CFLAGS = $(SIMPLE_EGL_CLIENT_CFLAGS) $(CLIENT_CFLAGS)
+weston_subsurfaces_CFLAGS =                    \
+       $(AM_CFLAGS)                            \
+       $(SIMPLE_EGL_CLIENT_CFLAGS)             \
+       $(CLIENT_CFLAGS)
 weston_subsurfaces_LDADD = libtoytoolkit.la $(SIMPLE_EGL_CLIENT_LIBS) -lm
 endif
 
@@ -523,7 +558,7 @@ nodist_weston_editor_SOURCES =                      \
        protocol/text-protocol.c                \
        protocol/text-client-protocol.h
 weston_editor_LDADD = libtoytoolkit.la $(PANGO_LIBS)
-weston_editor_CFLAGS = $(CLIENT_CFLAGS) $(PANGO_CFLAGS)
+weston_editor_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) $(PANGO_CFLAGS)
 endif
 
 weston_keyboard_SOURCES = clients/keyboard.c
@@ -533,20 +568,17 @@ nodist_weston_keyboard_SOURCES =                  \
        protocol/input-method-protocol.c                \
        protocol/input-method-client-protocol.h
 weston_keyboard_LDADD = libtoytoolkit.la
-weston_keyboard_CFLAGS = $(CLIENT_CFLAGS)
+weston_keyboard_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_simple_im_SOURCES = clients/weston-simple-im.c
 nodist_weston_simple_im_SOURCES =              \
        protocol/input-method-protocol.c        \
        protocol/input-method-client-protocol.h
 weston_simple_im_LDADD = $(CLIENT_LIBS)
-weston_simple_im_CFLAGS = $(CLIENT_CFLAGS)
+weston_simple_im_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
-weston_info_SOURCES =                          \
-       clients/weston-info.c                   \
-       shared/os-compatibility.c               \
-       shared/os-compatibility.h
-weston_info_LDADD = $(WESTON_INFO_LIBS)
+weston_info_SOURCES = clients/weston-info.c
+weston_info_LDADD = $(WESTON_INFO_LIBS) libshared.la
 weston_info_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 weston_desktop_shell_SOURCES = clients/desktop-shell.c
@@ -554,13 +586,13 @@ nodist_weston_desktop_shell_SOURCES =                     \
        protocol/desktop-shell-client-protocol.h        \
        protocol/desktop-shell-protocol.c
 weston_desktop_shell_LDADD = libtoytoolkit.la
-weston_desktop_shell_CFLAGS = $(CLIENT_CFLAGS)
+weston_desktop_shell_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 if BUILD_FULL_GL_CLIENTS
 demo_clients += weston-gears
 weston_gears_SOURCES = clients/gears.c
 weston_gears_LDADD = libtoytoolkit.la
-weston_gears_CFLAGS = $(CLIENT_CFLAGS)
+weston_gears_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
 if HAVE_GLU
 libexec_PROGRAMS += weston-screensaver
@@ -576,7 +608,7 @@ nodist_weston_screensaver_SOURCES =                 \
        protocol/desktop-shell-protocol.c
 
 weston_screensaver_LDADD = libtoytoolkit.la $(GLU_LIBS)
-weston_screensaver_CFLAGS = $(GLU_CFLAGS) $(CLIENT_CFLAGS)
+weston_screensaver_CFLAGS = $(AM_CFLAGS) $(GLU_CFLAGS) $(CLIENT_CFLAGS)
 
 endif
 
@@ -599,6 +631,8 @@ BUILT_SOURCES +=                                    \
        protocol/scaler-protocol.c                      \
        protocol/workspaces-client-protocol.h           \
        protocol/workspaces-protocol.c                  \
+       protocol/fullscreen-shell-protocol.c            \
+       protocol/fullscreen-shell-client-protocol.h     \
        protocol/xdg-shell-protocol.c                   \
        protocol/xdg-shell-client-protocol.h
 
@@ -645,8 +679,7 @@ desktop_shell_la_CPPFLAGS =                 \
        -DIN_WESTON
 
 desktop_shell_la_LDFLAGS = -module -avoid-version
-desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS)   \
-       libshared.la
+desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la
 desktop_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
 desktop_shell_la_SOURCES =                             \
        desktop-shell/shell.h                           \
@@ -662,6 +695,50 @@ nodist_desktop_shell_la_SOURCES =                  \
 BUILT_SOURCES += $(nodist_desktop_shell_la_SOURCES)
 endif
 
+if ENABLE_FULLSCREEN_SHELL
+
+module_LTLIBRARIES += fullscreen-shell.la
+
+fullscreen_shell_la_CPPFLAGS =                 \
+       -I$(top_builddir)/protocol              \
+       -I$(top_srcdir)/shared                  \
+       -I$(top_srcdir)/src                     \
+       -I$(top_builddir)/src                   \
+       -DIN_WESTON
+
+fullscreen_shell_la_LDFLAGS = -module -avoid-version
+fullscreen_shell_la_LIBADD = $(COMPOSITOR_LIBS)
+fullscreen_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
+fullscreen_shell_la_SOURCES =                  \
+       fullscreen-shell/fullscreen-shell.c
+nodist_fullscreen_shell_la_SOURCES =                   \
+       protocol/fullscreen-shell-protocol.c            \
+       protocol/fullscreen-shell-server-protocol.h
+
+BUILT_SOURCES += $(nodist_fullscreen_shell_la_SOURCES)
+endif
+
+if ENABLE_SCREEN_SHARING
+
+module_LTLIBRARIES += screen-share.la
+
+screen_share_la_CPPFLAGS = $(AM_CPPFLAGS) -DBINDIR='"$(bindir)"'
+screen_share_la_LDFLAGS = -module -avoid-version
+screen_share_la_LIBADD =                       \
+       $(COMPOSITOR_LIBS)                      \
+       $(SCREEN_SHARE_LIBS)                    \
+       libshared-cairo.la
+screen_share_la_CFLAGS =                       \
+       $(COMPOSITOR_CFLAGS)                    \
+       $(SCREEN_SHARE_CFLAGS)                  \
+       $(GCC_CFLAGS)
+screen_share_la_SOURCES =                      \
+       src/screen-share.c
+nodist_screen_share_la_SOURCES =                       \
+       protocol/fullscreen-shell-protocol.c            \
+       protocol/fullscreen-shell-client-protocol.h
+
+endif
 
 if ENABLE_XWAYLAND
 
@@ -695,11 +772,6 @@ xwayland_la_SOURCES =                              \
        xwayland/launcher.c                     \
        xwayland/hash.c                         \
        xwayland/hash.h
-nodist_xwayland_la_SOURCES =                   \
-       protocol/xserver-protocol.c             \
-       protocol/xserver-server-protocol.h
-
-BUILT_SOURCES += $(nodist_xwayland_la_SOURCES)
 endif
 
 
@@ -774,7 +846,7 @@ LA_LOG_COMPILER = $(srcdir)/tests/weston-tests-env
 WESTON_LOG_COMPILER = $(srcdir)/tests/weston-tests-env
 
 clean-local:
-       -rm -rf tests/logs
+       -rm -rf logs
 
 # To remove when automake 1.11 support is dropped
 export abs_builddir
@@ -835,34 +907,34 @@ libtest_client_la_SOURCES =                       \
 nodist_libtest_client_la_SOURCES =             \
        protocol/wayland-test-protocol.c        \
        protocol/wayland-test-client-protocol.h
-libtest_client_la_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
+libtest_client_la_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS)
 libtest_client_la_LIBADD = $(TEST_CLIENT_LIBS) libshared.la libtest-runner.la
 
 bad_buffer_weston_SOURCES = tests/bad-buffer-test.c
-bad_buffer_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
+bad_buffer_weston_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS)
 bad_buffer_weston_LDADD = libtest-client.la
 
 keyboard_weston_SOURCES = tests/keyboard-test.c
-keyboard_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
+keyboard_weston_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS)
 keyboard_weston_LDADD = libtest-client.la
 
 event_weston_SOURCES = tests/event-test.c
-event_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
+event_weston_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS)
 event_weston_LDADD = libtest-client.la
 
 button_weston_SOURCES = tests/button-test.c
-button_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
+button_weston_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS)
 button_weston_LDADD = libtest-client.la
 
 text_weston_SOURCES = tests/text-test.c
 nodist_text_weston_SOURCES =                   \
        protocol/text-protocol.c                \
        protocol/text-client-protocol.h
-text_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
+text_weston_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS)
 text_weston_LDADD = libtest-client.la
 
 subsurface_weston_SOURCES = tests/subsurface-test.c
-subsurface_weston_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CLIENT_CFLAGS)
+subsurface_weston_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS)
 subsurface_weston_LDADD = libtest-client.la
 
 if ENABLE_EGL
@@ -873,10 +945,10 @@ buffer_count_weston_LDADD = libtest-client.la $(EGL_TESTS_LIBS)
 endif
 
 if ENABLE_XWAYLAND_TEST
-weston_tests +=        xwayland.weston
-xwayland_weston_SOURCES = tests/xwayland-test.c
-xwayland_weston_CFLAGS = $(GCC_CFLAGS) $(XWAYLAND_TEST_CFLAGS)
-xwayland_weston_LDADD = libtest-client.la $(XWAYLAND_TEST_LIBS)
+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_LDADD = libtest-client.la $(XWAYLAND_TEST_LIBS)
 endif
 
 matrix_test_SOURCES =                          \
@@ -908,13 +980,13 @@ BUILT_SOURCES +=                          \
 EXTRA_DIST +=                                  \
        protocol/desktop-shell.xml              \
        protocol/screenshooter.xml              \
-       protocol/xserver.xml                    \
        protocol/text.xml                       \
        protocol/input-method.xml               \
        protocol/workspaces.xml                 \
        protocol/text-cursor-position.xml       \
        protocol/wayland-test.xml               \
        protocol/xdg-shell.xml                  \
+       protocol/fullscreen-shell.xml           \
        protocol/scaler.xml
 
 man_MANS = weston.1 weston.ini.5