Commit 58f98c99 authored by Pekka Paalanen's avatar Pekka Paalanen

Move weston source to compositor/

This is the start of separating weston-the-compositor source files from
libweston source files.

This is moving all the files related to the 'weston' binary. Also the
CMS and systemd plugins are moved.

xwayland plugin is not moved, because it will be turned into a
libweston feature.

To avoid breaking the build, #includes for weston.h are fixed to use
compositor/weston.h. This serves as a reminder that such files may need
further attention: moving to the right directory, or maybe using the
proper -I flags instead.

v2: Move also screen-share.c, and add a note about weston-launch.
Signed-off-by: Pekka Paalanen's avatarPekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: default avatarYong Bakos <ybakos@humanoriented.com>
Acked-by: Daniel Stone's avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic's avatarQuentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Quentin Glidic's avatarQuentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: default avatarBenoit Gschwind <gschwind@gnu-log.net>
Acked-by: default avatarBenoit Gschwind <gschwind@gnu-log.net>
[Pekka: rebased]
parent a1046adc
......@@ -113,7 +113,7 @@ systemd_notify_la_CFLAGS = \
$(PIXMAN_CFLAGS) \
$(AM_CFLAGS)
systemd_notify_la_SOURCES = \
src/systemd-notify.c \
compositor/systemd-notify.c \
shared/helpers.h \
shared/zalloc.h \
src/compositor.h
......@@ -148,9 +148,9 @@ weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
-lm libshared.la libweston.la
weston_SOURCES = \
src/main.c \
src/weston-screenshooter.c \
src/text-backend.c
compositor/main.c \
compositor/weston-screenshooter.c \
compositor/text-backend.c
# Track this dependency explicitly instead of using BUILT_SOURCES. We
# add BUILT_SOURCES to CLEANFILES, but we want to keep git-version.h
......@@ -220,10 +220,10 @@ endif
endif # BUILD_WESTON_LAUNCH
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = src/weston.pc src/libweston-${LIBWESTON_ABI_VERSION}.pc
pkgconfig_DATA = compositor/weston.pc src/libweston-${LIBWESTON_ABI_VERSION}.pc
wayland_sessiondir = $(datadir)/wayland-sessions
dist_wayland_session_DATA = src/weston.desktop
dist_wayland_session_DATA = compositor/weston.desktop
libwestonincludedir = $(includedir)/libweston-${LIBWESTON_ABI_VERSION}
libwestoninclude_HEADERS = \
......@@ -242,7 +242,7 @@ libwestoninclude_HEADERS = \
shared/platform.h
westonincludedir = $(includedir)/weston
westoninclude_HEADERS = src/weston.h
westoninclude_HEADERS = compositor/weston.h
if ENABLE_IVI_SHELL
westoninclude_HEADERS += \
......@@ -401,9 +401,9 @@ cms_static_la_LDFLAGS = -module -avoid-version
cms_static_la_LIBADD = $(COMPOSITOR_LIBS) $(LCMS_LIBS) libshared.la
cms_static_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LCMS_CFLAGS)
cms_static_la_SOURCES = \
src/cms-static.c \
src/cms-helper.c \
src/cms-helper.h \
compositor/cms-static.c \
compositor/cms-helper.c \
compositor/cms-helper.h \
shared/helpers.h
if ENABLE_COLORD
module_LTLIBRARIES += cms-colord.la
......@@ -411,9 +411,9 @@ cms_colord_la_LDFLAGS = -module -avoid-version
cms_colord_la_LIBADD = $(COMPOSITOR_LIBS) $(COLORD_LIBS)
cms_colord_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(COLORD_CFLAGS)
cms_colord_la_SOURCES = \
src/cms-colord.c \
src/cms-helper.c \
src/cms-helper.h \
compositor/cms-colord.c \
compositor/cms-helper.c \
compositor/cms-helper.h \
shared/helpers.h
endif
endif
......@@ -945,7 +945,7 @@ screen_share_la_CFLAGS = \
$(SCREEN_SHARE_CFLAGS) \
$(AM_CFLAGS)
screen_share_la_SOURCES = \
src/screen-share.c \
compositor/screen-share.c \
shared/helpers.h
nodist_screen_share_la_SOURCES = \
protocol/fullscreen-shell-unstable-v1-protocol.c \
......
......@@ -114,6 +114,11 @@ Details:
- xwayland ???
- weston-launch is still with libweston even though it can only launch
Weston and nothing else. We would like to allow it to launch any compositor,
but since it gives by design root access to input devices and DRM, how can
we restrict it to intended programs?
There are still many more details to be decided.
......@@ -141,13 +146,13 @@ would be roughly like this:
- fbdev-backend (depends on libudev...)
- rdp-backend (depends on freerdp)
+ screen-share
- weston (the executable, not parallel-installable):
+ desktop shell
+ ivi-shell
+ fullscreen shell
+ weston-info, weston-terminal, etc. we install by default
+ screen-share
- weston demos (not parallel-installable)
+ weston-simple-* programs
......
......@@ -633,7 +633,7 @@ if test "x$enable_systemd_notify" = "xyes"; then
PKG_CHECK_MODULES(SYSTEMD_DAEMON, [libsystemd])
fi
AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
AC_CONFIG_FILES([Makefile src/version.h compositor/weston.pc])
# AC_CONFIG_FILES needs the full name when running autoconf, so we need to use
# libweston_abi_version here, and outside [] because of m4 quoting rules
......
......@@ -36,7 +36,7 @@
#include <sys/types.h>
#include "shell.h"
#include "weston.h"
#include "compositor/weston.h"
#include "weston-desktop-shell-server-protocol.h"
#include "shared/config-parser.h"
#include "shared/helpers.h"
......
......@@ -62,7 +62,7 @@
#include "ivi-hmi-controller-server-protocol.h"
#include "shared/helpers.h"
#include "shared/xalloc.h"
#include "src/weston.h"
#include "compositor/weston.h"
/*****************************************************************************
* structure, globals
......
......@@ -60,7 +60,7 @@
#include <string.h>
#include <assert.h>
#include "weston.h"
#include "compositor/weston.h"
#include "compositor.h"
#include "ivi-shell.h"
#include "ivi-layout-export.h"
......
......@@ -46,7 +46,7 @@
#include "ivi-layout-export.h"
#include "ivi-layout-shell.h"
#include "shared/helpers.h"
#include "weston.h"
#include "compositor/weston.h"
/* Representation of ivi_surface protocol object. */
struct ivi_shell_surface
......
......@@ -33,7 +33,7 @@
#include <assert.h>
#include "src/compositor.h"
#include "src/weston.h"
#include "compositor/weston.h"
#include "weston-test-server-protocol.h"
#include "ivi-test.h"
#include "ivi-shell/ivi-layout-export.h"
......
......@@ -32,7 +32,7 @@
#include <string.h>
#include "src/compositor.h"
#include "src/weston.h"
#include "compositor/weston.h"
#include "weston-test-server-protocol.h"
#ifdef ENABLE_EGL
......
......@@ -37,7 +37,7 @@
#include "xwayland.h"
#include "shared/helpers.h"
#include "weston.h"
#include "compositor/weston.h"
static int
handle_sigusr1(int signal_number, void *data)
......
......@@ -30,7 +30,7 @@
#include <cairo/cairo-xcb.h>
#include "compositor.h"
#include "weston.h"
#include "compositor/weston.h"
#define SEND_EVENT_MASK (0x80)
#define EVENT_TYPE(event) ((event)->response_type & ~SEND_EVENT_MASK)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment