[PATCH weston 2/2] Rename src/ to libweston/
Pekka Paalanen
ppaalanen at gmail.com
Fri Jun 3 14:33:19 UTC 2016
From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
This clarifies what is supposed to be the libweston code.
Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
---
Makefile.am | 184 ++++++++++++++--------------
clients/cliptest.c | 2 +-
configure.ac | 4 +-
{src => libweston}/animation.c | 0
{src => libweston}/bindings.c | 0
{src => libweston}/clipboard.c | 0
{src => libweston}/compositor-drm.c | 0
{src => libweston}/compositor-drm.h | 0
{src => libweston}/compositor-fbdev.c | 0
{src => libweston}/compositor-fbdev.h | 0
{src => libweston}/compositor-headless.c | 0
{src => libweston}/compositor-headless.h | 0
{src => libweston}/compositor-rdp.c | 0
{src => libweston}/compositor-rdp.h | 0
{src => libweston}/compositor-wayland.c | 0
{src => libweston}/compositor-wayland.h | 0
{src => libweston}/compositor-x11.c | 0
{src => libweston}/compositor-x11.h | 0
{src => libweston}/compositor.c | 0
{src => libweston}/compositor.h | 0
{src => libweston}/data-device.c | 0
{src => libweston}/dbus.c | 0
{src => libweston}/dbus.h | 0
{src => libweston}/gl-renderer.c | 0
{src => libweston}/gl-renderer.h | 0
{src => libweston}/input.c | 0
{src => libweston}/launcher-direct.c | 0
{src => libweston}/launcher-impl.h | 0
{src => libweston}/launcher-logind.c | 0
{src => libweston}/launcher-util.c | 0
{src => libweston}/launcher-util.h | 0
{src => libweston}/launcher-weston-launch.c | 0
{src => libweston}/libbacklight.c | 0
{src => libweston}/libbacklight.h | 0
{src => libweston}/libinput-device.c | 0
{src => libweston}/libinput-device.h | 0
{src => libweston}/libinput-seat.c | 0
{src => libweston}/libinput-seat.h | 0
{src => libweston}/libweston.pc.in | 0
{src => libweston}/linux-dmabuf.c | 0
{src => libweston}/linux-dmabuf.h | 0
{src => libweston}/log.c | 0
{src => libweston}/noop-renderer.c | 0
{src => libweston}/pixman-renderer.c | 0
{src => libweston}/pixman-renderer.h | 0
{src => libweston}/screen-share.c | 0
{src => libweston}/screenshooter.c | 0
{src => libweston}/spring-tool.c | 0
{src => libweston}/timeline-object.h | 0
{src => libweston}/timeline.c | 0
{src => libweston}/timeline.h | 0
{src => libweston}/vaapi-recorder.c | 0
{src => libweston}/vaapi-recorder.h | 0
{src => libweston}/version.h.in | 0
{src => libweston}/vertex-clipping.c | 0
{src => libweston}/vertex-clipping.h | 0
{src => libweston}/weston-egl-ext.h | 0
{src => libweston}/weston-launch.c | 0
{src => libweston}/weston-launch.h | 0
{src => libweston}/zoom.c | 0
tests/ivi_layout-internal-test.c | 2 +-
tests/ivi_layout-test-plugin.c | 2 +-
tests/surface-global-test.c | 2 +-
tests/surface-test.c | 2 +-
tests/vertex-clip-test.c | 2 +-
tests/weston-test.c | 4 +-
66 files changed, 102 insertions(+), 102 deletions(-)
rename {src => libweston}/animation.c (100%)
rename {src => libweston}/bindings.c (100%)
rename {src => libweston}/clipboard.c (100%)
rename {src => libweston}/compositor-drm.c (100%)
rename {src => libweston}/compositor-drm.h (100%)
rename {src => libweston}/compositor-fbdev.c (100%)
rename {src => libweston}/compositor-fbdev.h (100%)
rename {src => libweston}/compositor-headless.c (100%)
rename {src => libweston}/compositor-headless.h (100%)
rename {src => libweston}/compositor-rdp.c (100%)
rename {src => libweston}/compositor-rdp.h (100%)
rename {src => libweston}/compositor-wayland.c (100%)
rename {src => libweston}/compositor-wayland.h (100%)
rename {src => libweston}/compositor-x11.c (100%)
rename {src => libweston}/compositor-x11.h (100%)
rename {src => libweston}/compositor.c (100%)
rename {src => libweston}/compositor.h (100%)
rename {src => libweston}/data-device.c (100%)
rename {src => libweston}/dbus.c (100%)
rename {src => libweston}/dbus.h (100%)
rename {src => libweston}/gl-renderer.c (100%)
rename {src => libweston}/gl-renderer.h (100%)
rename {src => libweston}/input.c (100%)
rename {src => libweston}/launcher-direct.c (100%)
rename {src => libweston}/launcher-impl.h (100%)
rename {src => libweston}/launcher-logind.c (100%)
rename {src => libweston}/launcher-util.c (100%)
rename {src => libweston}/launcher-util.h (100%)
rename {src => libweston}/launcher-weston-launch.c (100%)
rename {src => libweston}/libbacklight.c (100%)
rename {src => libweston}/libbacklight.h (100%)
rename {src => libweston}/libinput-device.c (100%)
rename {src => libweston}/libinput-device.h (100%)
rename {src => libweston}/libinput-seat.c (100%)
rename {src => libweston}/libinput-seat.h (100%)
rename {src => libweston}/libweston.pc.in (100%)
rename {src => libweston}/linux-dmabuf.c (100%)
rename {src => libweston}/linux-dmabuf.h (100%)
rename {src => libweston}/log.c (100%)
rename {src => libweston}/noop-renderer.c (100%)
rename {src => libweston}/pixman-renderer.c (100%)
rename {src => libweston}/pixman-renderer.h (100%)
rename {src => libweston}/screen-share.c (100%)
rename {src => libweston}/screenshooter.c (100%)
rename {src => libweston}/spring-tool.c (100%)
rename {src => libweston}/timeline-object.h (100%)
rename {src => libweston}/timeline.c (100%)
rename {src => libweston}/timeline.h (100%)
rename {src => libweston}/vaapi-recorder.c (100%)
rename {src => libweston}/vaapi-recorder.h (100%)
rename {src => libweston}/version.h.in (100%)
rename {src => libweston}/vertex-clipping.c (100%)
rename {src => libweston}/vertex-clipping.h (100%)
rename {src => libweston}/weston-egl-ext.h (100%)
rename {src => libweston}/weston-launch.c (100%)
rename {src => libweston}/weston-launch.h (100%)
rename {src => libweston}/zoom.c (100%)
diff --git a/Makefile.am b/Makefile.am
index bdb929c..3cfff31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,8 +44,8 @@ all-local : weston.ini ivi-shell/weston.ini
AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src \
+ -I$(top_srcdir)/libweston \
+ -I$(top_builddir)/libweston \
-I$(top_builddir)/clients \
-I$(top_builddir)/tests \
-I$(top_srcdir)/shared \
@@ -70,38 +70,38 @@ libweston_la_LIBADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
libweston_la_LDFLAGS = -release ${LIBWESTON_ABI_VERSION}
libweston_la_SOURCES = \
- src/git-version.h \
- src/log.c \
- src/compositor.c \
- src/compositor.h \
- src/compositor-drm.h \
- src/compositor-fbdev.h \
- src/compositor-headless.h \
- src/compositor-rdp.h \
- src/compositor-wayland.h \
- src/compositor-x11.h \
- src/input.c \
- src/data-device.c \
- src/screenshooter.c \
- src/clipboard.c \
- src/zoom.c \
- src/bindings.c \
- src/animation.c \
- src/noop-renderer.c \
- src/pixman-renderer.c \
- src/pixman-renderer.h \
- src/timeline.c \
- src/timeline.h \
- src/timeline-object.h \
- src/linux-dmabuf.c \
- src/linux-dmabuf.h \
+ libweston/git-version.h \
+ libweston/log.c \
+ libweston/compositor.c \
+ libweston/compositor.h \
+ libweston/compositor-drm.h \
+ libweston/compositor-fbdev.h \
+ libweston/compositor-headless.h \
+ libweston/compositor-rdp.h \
+ libweston/compositor-wayland.h \
+ libweston/compositor-x11.h \
+ libweston/input.c \
+ libweston/data-device.c \
+ libweston/screenshooter.c \
+ libweston/clipboard.c \
+ libweston/zoom.c \
+ libweston/bindings.c \
+ libweston/animation.c \
+ libweston/noop-renderer.c \
+ libweston/pixman-renderer.c \
+ libweston/pixman-renderer.h \
+ libweston/timeline.c \
+ libweston/timeline.h \
+ libweston/timeline-object.h \
+ libweston/linux-dmabuf.c \
+ libweston/linux-dmabuf.h \
shared/helpers.h \
shared/matrix.c \
shared/matrix.h \
shared/timespec-util.h \
shared/zalloc.h \
shared/platform.h \
- src/weston-egl-ext.h
+ libweston/weston-egl-ext.h
if SYSTEMD_NOTIFY_SUPPORT
module_LTLIBRARIES += systemd-notify.la
@@ -116,7 +116,7 @@ systemd_notify_la_SOURCES = \
compositor/systemd-notify.c \
shared/helpers.h \
shared/zalloc.h \
- src/compositor.h
+ libweston/compositor.h
endif
nodist_libweston_la_SOURCES = \
@@ -156,37 +156,37 @@ weston_SOURCES = \
# add BUILT_SOURCES to CLEANFILES, but we want to keep git-version.h
# in case we're building from tarballs.
-src/compositor.c : $(top_builddir)/src/git-version.h
+libweston/compositor.c : $(top_builddir)/libweston/git-version.h
noinst_LTLIBRARIES += \
libsession-helper.la
libsession_helper_la_SOURCES = \
- src/launcher-util.c \
- src/launcher-util.h \
- src/launcher-impl.h \
- src/weston-launch.h \
- src/launcher-weston-launch.c \
- src/launcher-direct.c
+ libweston/launcher-util.c \
+ libweston/launcher-util.h \
+ libweston/launcher-impl.h \
+ libweston/weston-launch.h \
+ libweston/launcher-weston-launch.c \
+ libweston/launcher-direct.c
libsession_helper_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS)
libsession_helper_la_LIBADD = $(LIBDRM_LIBS)
if ENABLE_DBUS
if HAVE_SYSTEMD_LOGIN
libsession_helper_la_SOURCES += \
- src/dbus.h \
- src/dbus.c \
- src/launcher-logind.c
+ libweston/dbus.h \
+ libweston/dbus.c \
+ libweston/launcher-logind.c
libsession_helper_la_CFLAGS += $(SYSTEMD_LOGIN_CFLAGS) $(DBUS_CFLAGS)
libsession_helper_la_LIBADD += $(SYSTEMD_LOGIN_LIBS) $(DBUS_LIBS)
endif
endif
if HAVE_GIT_REPO
-src/git-version.h : $(top_srcdir)/.git/logs/HEAD
+libweston/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 :
+libweston/git-version.h :
$(AM_V_GEN)echo "#define BUILD_ID \"unknown (not built from git or tarball)\"" > $@
endif
@@ -195,7 +195,7 @@ endif
if BUILD_WESTON_LAUNCH
bin_PROGRAMS += weston-launch
-weston_launch_SOURCES = src/weston-launch.c src/weston-launch.h
+weston_launch_SOURCES = libweston/weston-launch.c libweston/weston-launch.h
weston_launch_CPPFLAGS = -DBINDIR='"$(bindir)"'
weston_launch_CFLAGS= \
$(AM_CFLAGS) \
@@ -220,22 +220,22 @@ endif
endif # BUILD_WESTON_LAUNCH
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = compositor/weston.pc src/libweston-${LIBWESTON_ABI_VERSION}.pc
+pkgconfig_DATA = compositor/weston.pc libweston/libweston-${LIBWESTON_ABI_VERSION}.pc
wayland_sessiondir = $(datadir)/wayland-sessions
dist_wayland_session_DATA = compositor/weston.desktop
libwestonincludedir = $(includedir)/libweston-${LIBWESTON_ABI_VERSION}
-libwestoninclude_HEADERS = \
- src/version.h \
- src/compositor.h \
- src/compositor-drm.h \
- src/compositor-fbdev.h \
- src/compositor-headless.h \
- src/compositor-rdp.h \
- src/compositor-wayland.h \
- src/compositor-x11.h \
- src/timeline-object.h \
+libwestoninclude_HEADERS = \
+ libweston/version.h \
+ libweston/compositor.h \
+ libweston/compositor-drm.h \
+ libweston/compositor-fbdev.h \
+ libweston/compositor-headless.h \
+ libweston/compositor-rdp.h \
+ libweston/compositor-wayland.h \
+ libweston/compositor-x11.h \
+ libweston/timeline-object.h \
shared/matrix.h \
shared/config-parser.h \
shared/zalloc.h \
@@ -259,10 +259,10 @@ gl_renderer_la_CFLAGS = \
$(GL_RENDERER_CFLAGS) \
$(AM_CFLAGS)
gl_renderer_la_SOURCES = \
- src/gl-renderer.h \
- src/gl-renderer.c \
- src/vertex-clipping.c \
- src/vertex-clipping.h \
+ libweston/gl-renderer.h \
+ libweston/gl-renderer.c \
+ libweston/vertex-clipping.c \
+ libweston/vertex-clipping.h \
shared/helpers.h
endif
@@ -279,17 +279,17 @@ x11_backend_la_CFLAGS = \
$(X11_COMPOSITOR_CFLAGS) \
$(AM_CFLAGS)
x11_backend_la_SOURCES = \
- src/compositor-x11.c \
- src/compositor-x11.h \
+ libweston/compositor-x11.c \
+ libweston/compositor-x11.h \
shared/helpers.h
endif
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 \
+ libweston/libinput-seat.c \
+ libweston/libinput-seat.h \
+ libweston/libinput-device.c \
+ libweston/libinput-device.h \
shared/helpers.h
if ENABLE_DRM_COMPOSITOR
@@ -308,16 +308,16 @@ drm_backend_la_CFLAGS = \
$(DRM_COMPOSITOR_CFLAGS) \
$(AM_CFLAGS)
drm_backend_la_SOURCES = \
- src/compositor-drm.c \
- src/compositor-drm.h \
+ libweston/compositor-drm.c \
+ libweston/compositor-drm.h \
$(INPUT_BACKEND_SOURCES) \
shared/helpers.h \
shared/timespec-util.h \
- src/libbacklight.c \
- src/libbacklight.h
+ libweston/libbacklight.c \
+ libweston/libbacklight.h
if ENABLE_VAAPI_RECORDER
-drm_backend_la_SOURCES += src/vaapi-recorder.c src/vaapi-recorder.h
+drm_backend_la_SOURCES += libweston/vaapi-recorder.c libweston/vaapi-recorder.h
drm_backend_la_LIBADD += $(LIBVA_LIBS)
drm_backend_la_CFLAGS += $(LIBVA_CFLAGS)
endif
@@ -338,8 +338,8 @@ wayland_backend_la_CFLAGS = \
$(WAYLAND_COMPOSITOR_CFLAGS) \
$(AM_CFLAGS)
wayland_backend_la_SOURCES = \
- src/compositor-wayland.c \
- src/compositor-wayland.h \
+ libweston/compositor-wayland.c \
+ libweston/compositor-wayland.h \
shared/helpers.h
nodist_wayland_backend_la_SOURCES = \
protocol/fullscreen-shell-unstable-v1-protocol.c \
@@ -352,8 +352,8 @@ headless_backend_la_LDFLAGS = -module -avoid-version
headless_backend_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la
headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(AM_CFLAGS)
headless_backend_la_SOURCES = \
- src/compositor-headless.c \
- src/compositor-headless.h \
+ libweston/compositor-headless.c \
+ libweston/compositor-headless.h \
shared/helpers.h
endif
@@ -373,8 +373,8 @@ fbdev_backend_la_CFLAGS = \
$(PIXMAN_CFLAGS) \
$(AM_CFLAGS)
fbdev_backend_la_SOURCES = \
- src/compositor-fbdev.c \
- src/compositor-fbdev.h \
+ libweston/compositor-fbdev.c \
+ libweston/compositor-fbdev.h \
shared/helpers.h \
$(INPUT_BACKEND_SOURCES)
endif
@@ -390,8 +390,8 @@ rdp_backend_la_CFLAGS = \
$(RDP_COMPOSITOR_CFLAGS) \
$(AM_CFLAGS)
rdp_backend_la_SOURCES = \
- src/compositor-rdp.c \
- src/compositor-rdp.h \
+ libweston/compositor-rdp.c \
+ libweston/compositor-rdp.h \
shared/helpers.h
endif
@@ -422,11 +422,11 @@ noinst_PROGRAMS += spring-tool
spring_tool_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS)
spring_tool_LDADD = $(COMPOSITOR_LIBS) -lm
spring_tool_SOURCES = \
- src/spring-tool.c \
- src/animation.c \
+ libweston/spring-tool.c \
+ libweston/animation.c \
shared/matrix.c \
shared/matrix.h \
- src/compositor.h
+ libweston/compositor.h
if BUILD_CLIENTS
@@ -607,8 +607,8 @@ weston_image_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
weston_cliptest_SOURCES = \
clients/cliptest.c \
- src/vertex-clipping.c \
- src/vertex-clipping.h
+ libweston/vertex-clipping.c \
+ libweston/vertex-clipping.h
weston_cliptest_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
weston_cliptest_LDADD = libtoytoolkit.la
@@ -837,8 +837,8 @@ module_LTLIBRARIES += desktop-shell.la
desktop_shell_la_CPPFLAGS = \
-I$(top_builddir)/protocol \
-I$(top_srcdir)/shared \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src \
+ -I$(top_srcdir)/libweston \
+ -I$(top_builddir)/libweston \
-I$(top_builddir)/desktop-shell \
-DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \
@@ -870,8 +870,8 @@ 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 \
+ -I$(top_srcdir)/libweston \
+ -I$(top_builddir)/libweston \
-DIN_WESTON
fullscreen_shell_la_LDFLAGS = -module -avoid-version
@@ -945,7 +945,7 @@ screen_share_la_CFLAGS = \
$(SCREEN_SHARE_CFLAGS) \
$(AM_CFLAGS)
screen_share_la_SOURCES = \
- src/screen-share.c \
+ libweston/screen-share.c \
shared/helpers.h
nodist_screen_share_la_SOURCES = \
protocol/fullscreen-shell-unstable-v1-protocol.c \
@@ -960,8 +960,8 @@ module_LTLIBRARIES += xwayland.la
xwayland_la_CPPFLAGS = \
-I$(top_builddir)/protocol \
-I$(top_srcdir)/shared \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src \
+ -I$(top_srcdir)/libweston \
+ -I$(top_builddir)/libweston \
-I$(top_builddir)/xwayland \
-DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \
@@ -1183,8 +1183,8 @@ config_parser_test_CFLAGS = \
vertex_clip_test_SOURCES = \
tests/vertex-clip-test.c \
shared/helpers.h \
- src/vertex-clipping.c \
- src/vertex-clipping.h
+ libweston/vertex-clipping.c \
+ libweston/vertex-clipping.h
vertex_clip_test_LDADD = libtest-runner.la -lm $(CLOCK_GETTIME_LIBS)
libtest_client_la_SOURCES = \
@@ -1324,8 +1324,8 @@ if BUILD_SETBACKLIGHT
noinst_PROGRAMS += setbacklight
setbacklight_SOURCES = \
tests/setbacklight.c \
- src/libbacklight.c \
- src/libbacklight.h
+ libweston/libbacklight.c \
+ libweston/libbacklight.h
setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS)
setbacklight_LDADD = $(SETBACKLIGHT_LIBS)
endif
diff --git a/clients/cliptest.c b/clients/cliptest.c
index d0f4e3e..57aefda 100644
--- a/clients/cliptest.c
+++ b/clients/cliptest.c
@@ -49,7 +49,7 @@
#include <linux/input.h>
#include <wayland-client.h>
-#include "src/vertex-clipping.h"
+#include "libweston/vertex-clipping.h"
#include "shared/xalloc.h"
#include "window.h"
diff --git a/configure.ac b/configure.ac
index fa715ca..efc86a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -632,11 +632,11 @@ if test "x$enable_systemd_notify" = "xyes"; then
PKG_CHECK_MODULES(SYSTEMD_DAEMON, [libsystemd])
fi
-AC_CONFIG_FILES([Makefile src/version.h compositor/weston.pc])
+AC_CONFIG_FILES([Makefile libweston/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
-AC_CONFIG_FILES([src/libweston-]libweston_abi_version[.pc:src/libweston.pc.in])
+AC_CONFIG_FILES([libweston/libweston-]libweston_abi_version[.pc:libweston/libweston.pc.in])
AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])
diff --git a/src/animation.c b/libweston/animation.c
similarity index 100%
rename from src/animation.c
rename to libweston/animation.c
diff --git a/src/bindings.c b/libweston/bindings.c
similarity index 100%
rename from src/bindings.c
rename to libweston/bindings.c
diff --git a/src/clipboard.c b/libweston/clipboard.c
similarity index 100%
rename from src/clipboard.c
rename to libweston/clipboard.c
diff --git a/src/compositor-drm.c b/libweston/compositor-drm.c
similarity index 100%
rename from src/compositor-drm.c
rename to libweston/compositor-drm.c
diff --git a/src/compositor-drm.h b/libweston/compositor-drm.h
similarity index 100%
rename from src/compositor-drm.h
rename to libweston/compositor-drm.h
diff --git a/src/compositor-fbdev.c b/libweston/compositor-fbdev.c
similarity index 100%
rename from src/compositor-fbdev.c
rename to libweston/compositor-fbdev.c
diff --git a/src/compositor-fbdev.h b/libweston/compositor-fbdev.h
similarity index 100%
rename from src/compositor-fbdev.h
rename to libweston/compositor-fbdev.h
diff --git a/src/compositor-headless.c b/libweston/compositor-headless.c
similarity index 100%
rename from src/compositor-headless.c
rename to libweston/compositor-headless.c
diff --git a/src/compositor-headless.h b/libweston/compositor-headless.h
similarity index 100%
rename from src/compositor-headless.h
rename to libweston/compositor-headless.h
diff --git a/src/compositor-rdp.c b/libweston/compositor-rdp.c
similarity index 100%
rename from src/compositor-rdp.c
rename to libweston/compositor-rdp.c
diff --git a/src/compositor-rdp.h b/libweston/compositor-rdp.h
similarity index 100%
rename from src/compositor-rdp.h
rename to libweston/compositor-rdp.h
diff --git a/src/compositor-wayland.c b/libweston/compositor-wayland.c
similarity index 100%
rename from src/compositor-wayland.c
rename to libweston/compositor-wayland.c
diff --git a/src/compositor-wayland.h b/libweston/compositor-wayland.h
similarity index 100%
rename from src/compositor-wayland.h
rename to libweston/compositor-wayland.h
diff --git a/src/compositor-x11.c b/libweston/compositor-x11.c
similarity index 100%
rename from src/compositor-x11.c
rename to libweston/compositor-x11.c
diff --git a/src/compositor-x11.h b/libweston/compositor-x11.h
similarity index 100%
rename from src/compositor-x11.h
rename to libweston/compositor-x11.h
diff --git a/src/compositor.c b/libweston/compositor.c
similarity index 100%
rename from src/compositor.c
rename to libweston/compositor.c
diff --git a/src/compositor.h b/libweston/compositor.h
similarity index 100%
rename from src/compositor.h
rename to libweston/compositor.h
diff --git a/src/data-device.c b/libweston/data-device.c
similarity index 100%
rename from src/data-device.c
rename to libweston/data-device.c
diff --git a/src/dbus.c b/libweston/dbus.c
similarity index 100%
rename from src/dbus.c
rename to libweston/dbus.c
diff --git a/src/dbus.h b/libweston/dbus.h
similarity index 100%
rename from src/dbus.h
rename to libweston/dbus.h
diff --git a/src/gl-renderer.c b/libweston/gl-renderer.c
similarity index 100%
rename from src/gl-renderer.c
rename to libweston/gl-renderer.c
diff --git a/src/gl-renderer.h b/libweston/gl-renderer.h
similarity index 100%
rename from src/gl-renderer.h
rename to libweston/gl-renderer.h
diff --git a/src/input.c b/libweston/input.c
similarity index 100%
rename from src/input.c
rename to libweston/input.c
diff --git a/src/launcher-direct.c b/libweston/launcher-direct.c
similarity index 100%
rename from src/launcher-direct.c
rename to libweston/launcher-direct.c
diff --git a/src/launcher-impl.h b/libweston/launcher-impl.h
similarity index 100%
rename from src/launcher-impl.h
rename to libweston/launcher-impl.h
diff --git a/src/launcher-logind.c b/libweston/launcher-logind.c
similarity index 100%
rename from src/launcher-logind.c
rename to libweston/launcher-logind.c
diff --git a/src/launcher-util.c b/libweston/launcher-util.c
similarity index 100%
rename from src/launcher-util.c
rename to libweston/launcher-util.c
diff --git a/src/launcher-util.h b/libweston/launcher-util.h
similarity index 100%
rename from src/launcher-util.h
rename to libweston/launcher-util.h
diff --git a/src/launcher-weston-launch.c b/libweston/launcher-weston-launch.c
similarity index 100%
rename from src/launcher-weston-launch.c
rename to libweston/launcher-weston-launch.c
diff --git a/src/libbacklight.c b/libweston/libbacklight.c
similarity index 100%
rename from src/libbacklight.c
rename to libweston/libbacklight.c
diff --git a/src/libbacklight.h b/libweston/libbacklight.h
similarity index 100%
rename from src/libbacklight.h
rename to libweston/libbacklight.h
diff --git a/src/libinput-device.c b/libweston/libinput-device.c
similarity index 100%
rename from src/libinput-device.c
rename to libweston/libinput-device.c
diff --git a/src/libinput-device.h b/libweston/libinput-device.h
similarity index 100%
rename from src/libinput-device.h
rename to libweston/libinput-device.h
diff --git a/src/libinput-seat.c b/libweston/libinput-seat.c
similarity index 100%
rename from src/libinput-seat.c
rename to libweston/libinput-seat.c
diff --git a/src/libinput-seat.h b/libweston/libinput-seat.h
similarity index 100%
rename from src/libinput-seat.h
rename to libweston/libinput-seat.h
diff --git a/src/libweston.pc.in b/libweston/libweston.pc.in
similarity index 100%
rename from src/libweston.pc.in
rename to libweston/libweston.pc.in
diff --git a/src/linux-dmabuf.c b/libweston/linux-dmabuf.c
similarity index 100%
rename from src/linux-dmabuf.c
rename to libweston/linux-dmabuf.c
diff --git a/src/linux-dmabuf.h b/libweston/linux-dmabuf.h
similarity index 100%
rename from src/linux-dmabuf.h
rename to libweston/linux-dmabuf.h
diff --git a/src/log.c b/libweston/log.c
similarity index 100%
rename from src/log.c
rename to libweston/log.c
diff --git a/src/noop-renderer.c b/libweston/noop-renderer.c
similarity index 100%
rename from src/noop-renderer.c
rename to libweston/noop-renderer.c
diff --git a/src/pixman-renderer.c b/libweston/pixman-renderer.c
similarity index 100%
rename from src/pixman-renderer.c
rename to libweston/pixman-renderer.c
diff --git a/src/pixman-renderer.h b/libweston/pixman-renderer.h
similarity index 100%
rename from src/pixman-renderer.h
rename to libweston/pixman-renderer.h
diff --git a/src/screen-share.c b/libweston/screen-share.c
similarity index 100%
rename from src/screen-share.c
rename to libweston/screen-share.c
diff --git a/src/screenshooter.c b/libweston/screenshooter.c
similarity index 100%
rename from src/screenshooter.c
rename to libweston/screenshooter.c
diff --git a/src/spring-tool.c b/libweston/spring-tool.c
similarity index 100%
rename from src/spring-tool.c
rename to libweston/spring-tool.c
diff --git a/src/timeline-object.h b/libweston/timeline-object.h
similarity index 100%
rename from src/timeline-object.h
rename to libweston/timeline-object.h
diff --git a/src/timeline.c b/libweston/timeline.c
similarity index 100%
rename from src/timeline.c
rename to libweston/timeline.c
diff --git a/src/timeline.h b/libweston/timeline.h
similarity index 100%
rename from src/timeline.h
rename to libweston/timeline.h
diff --git a/src/vaapi-recorder.c b/libweston/vaapi-recorder.c
similarity index 100%
rename from src/vaapi-recorder.c
rename to libweston/vaapi-recorder.c
diff --git a/src/vaapi-recorder.h b/libweston/vaapi-recorder.h
similarity index 100%
rename from src/vaapi-recorder.h
rename to libweston/vaapi-recorder.h
diff --git a/src/version.h.in b/libweston/version.h.in
similarity index 100%
rename from src/version.h.in
rename to libweston/version.h.in
diff --git a/src/vertex-clipping.c b/libweston/vertex-clipping.c
similarity index 100%
rename from src/vertex-clipping.c
rename to libweston/vertex-clipping.c
diff --git a/src/vertex-clipping.h b/libweston/vertex-clipping.h
similarity index 100%
rename from src/vertex-clipping.h
rename to libweston/vertex-clipping.h
diff --git a/src/weston-egl-ext.h b/libweston/weston-egl-ext.h
similarity index 100%
rename from src/weston-egl-ext.h
rename to libweston/weston-egl-ext.h
diff --git a/src/weston-launch.c b/libweston/weston-launch.c
similarity index 100%
rename from src/weston-launch.c
rename to libweston/weston-launch.c
diff --git a/src/weston-launch.h b/libweston/weston-launch.h
similarity index 100%
rename from src/weston-launch.h
rename to libweston/weston-launch.h
diff --git a/src/zoom.c b/libweston/zoom.c
similarity index 100%
rename from src/zoom.c
rename to libweston/zoom.c
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index f5e296c..bc36ad1 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <stdbool.h>
-#include "src/compositor.h"
+#include "compositor.h"
#include "ivi-shell/ivi-layout-export.h"
#include "ivi-shell/ivi-layout-private.h"
#include "ivi-test.h"
diff --git a/tests/ivi_layout-test-plugin.c b/tests/ivi_layout-test-plugin.c
index 4cae3c5..1a28c6e 100644
--- a/tests/ivi_layout-test-plugin.c
+++ b/tests/ivi_layout-test-plugin.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <assert.h>
-#include "src/compositor.h"
+#include "compositor.h"
#include "compositor/weston.h"
#include "weston-test-server-protocol.h"
#include "ivi-test.h"
diff --git a/tests/surface-global-test.c b/tests/surface-global-test.c
index 11b2455..b0a1d1c 100644
--- a/tests/surface-global-test.c
+++ b/tests/surface-global-test.c
@@ -27,7 +27,7 @@
#include <assert.h>
-#include "src/compositor.h"
+#include "compositor.h"
static void
surface_to_from_global(void *data)
diff --git a/tests/surface-test.c b/tests/surface-test.c
index 55c324b..243f8dc 100644
--- a/tests/surface-test.c
+++ b/tests/surface-test.c
@@ -28,7 +28,7 @@
#include <stdio.h>
#include <assert.h>
-#include "src/compositor.h"
+#include "compositor.h"
static void
surface_transform(void *data)
diff --git a/tests/vertex-clip-test.c b/tests/vertex-clip-test.c
index 8a4e5a6..ce876ce 100644
--- a/tests/vertex-clip-test.c
+++ b/tests/vertex-clip-test.c
@@ -31,7 +31,7 @@
#include "weston-test-runner.h"
#include "shared/helpers.h"
-#include "src/vertex-clipping.h"
+#include "vertex-clipping.h"
#define BOUNDING_BOX_TOP_Y 100.0f
#define BOUNDING_BOX_LEFT_X 50.0f
diff --git a/tests/weston-test.c b/tests/weston-test.c
index 4b11a00..95c2d04 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -31,14 +31,14 @@
#include <unistd.h>
#include <string.h>
-#include "src/compositor.h"
+#include "compositor.h"
#include "compositor/weston.h"
#include "weston-test-server-protocol.h"
#ifdef ENABLE_EGL
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include "src/weston-egl-ext.h"
+#include "weston-egl-ext.h"
#endif /* ENABLE_EGL */
#include "shared/helpers.h"
--
2.7.3
More information about the wayland-devel
mailing list