diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-06-03 16:45:21 +0300 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-06-23 17:44:54 +0300 |
| commit | 58f98c99f533440a6ad996c299d74642659c51f2 (patch) | |
| tree | 0fdc6bf17ee6774d3eda8a0acce197c50151f069 /xwayland | |
| parent | a1046adc6603054187dc10ecaeee0ce271fcedec (diff) | |
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 <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
Acked-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: rebased]
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/launcher.c | 2 | ||||
| -rw-r--r-- | xwayland/xwayland.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xwayland/launcher.c b/xwayland/launcher.c index 4fd25537..f77146af 100644 --- a/xwayland/launcher.c +++ b/xwayland/launcher.c @@ -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) diff --git a/xwayland/xwayland.h b/xwayland/xwayland.h index e09c6f96..5606d125 100644 --- a/xwayland/xwayland.h +++ b/xwayland/xwayland.h @@ -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) |