downstream: allow regular users to launch Weston

[platform/upstream/weston.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a2f9038..b2d6893 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 
@@ -386,6 +389,7 @@ endif
 if BUILD_SIMPLE_CLIENTS
 demo_clients +=                                        \
        weston-simple-shm                       \
+       weston-simple-damage                    \
        weston-simple-touch                     \
        weston-multi-resource
 
@@ -398,6 +402,17 @@ nodist_weston_simple_shm_SOURCES =         \
 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
@@ -462,7 +477,10 @@ weston_image_SOURCES = clients/image.c
 weston_image_LDADD = libtoytoolkit.la
 weston_image_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
 
-weston_cliptest_SOURCES = clients/cliptest.c
+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
 
@@ -700,6 +718,28 @@ nodist_fullscreen_shell_la_SOURCES =                       \
 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
 
 module_LTLIBRARIES += xwayland.la
@@ -732,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
 
 
@@ -811,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
@@ -910,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 =                          \
@@ -945,7 +980,6 @@ BUILT_SOURCES +=                            \
 EXTRA_DIST +=                                  \
        protocol/desktop-shell.xml              \
        protocol/screenshooter.xml              \
-       protocol/xserver.xml                    \
        protocol/text.xml                       \
        protocol/input-method.xml               \
        protocol/workspaces.xml                 \