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]
diff --git a/Makefile.am b/Makefile.am
index 8466a5f..0d0334a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,7 +113,7 @@
$(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 @@
-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 # 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 @@
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_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_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_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 \