Rename src/ to libweston/

This clarifies what is supposed to be the libweston code.

v2: screen-share.c is already in compositor/ instead.

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]
dev
Pekka Paalanen 9 years ago
parent 58f98c99f5
commit b5e3ea218b
  1. 182
      Makefile.am
  2. 2
      clients/cliptest.c
  3. 4
      configure.ac
  4. 0
      libweston/animation.c
  5. 0
      libweston/bindings.c
  6. 0
      libweston/clipboard.c
  7. 0
      libweston/compositor-drm.c
  8. 0
      libweston/compositor-drm.h
  9. 0
      libweston/compositor-fbdev.c
  10. 0
      libweston/compositor-fbdev.h
  11. 0
      libweston/compositor-headless.c
  12. 0
      libweston/compositor-headless.h
  13. 0
      libweston/compositor-rdp.c
  14. 0
      libweston/compositor-rdp.h
  15. 0
      libweston/compositor-wayland.c
  16. 0
      libweston/compositor-wayland.h
  17. 0
      libweston/compositor-x11.c
  18. 0
      libweston/compositor-x11.h
  19. 0
      libweston/compositor.c
  20. 0
      libweston/compositor.h
  21. 0
      libweston/data-device.c
  22. 0
      libweston/dbus.c
  23. 0
      libweston/dbus.h
  24. 0
      libweston/gl-renderer.c
  25. 0
      libweston/gl-renderer.h
  26. 0
      libweston/input.c
  27. 0
      libweston/launcher-direct.c
  28. 0
      libweston/launcher-impl.h
  29. 0
      libweston/launcher-logind.c
  30. 0
      libweston/launcher-util.c
  31. 0
      libweston/launcher-util.h
  32. 0
      libweston/launcher-weston-launch.c
  33. 0
      libweston/libbacklight.c
  34. 0
      libweston/libbacklight.h
  35. 0
      libweston/libinput-device.c
  36. 0
      libweston/libinput-device.h
  37. 0
      libweston/libinput-seat.c
  38. 0
      libweston/libinput-seat.h
  39. 0
      libweston/libweston.pc.in
  40. 0
      libweston/linux-dmabuf.c
  41. 0
      libweston/linux-dmabuf.h
  42. 0
      libweston/log.c
  43. 0
      libweston/noop-renderer.c
  44. 0
      libweston/pixman-renderer.c
  45. 0
      libweston/pixman-renderer.h
  46. 0
      libweston/screenshooter.c
  47. 0
      libweston/spring-tool.c
  48. 0
      libweston/timeline-object.h
  49. 0
      libweston/timeline.c
  50. 0
      libweston/timeline.h
  51. 0
      libweston/vaapi-recorder.c
  52. 0
      libweston/vaapi-recorder.h
  53. 0
      libweston/version.h.in
  54. 0
      libweston/vertex-clipping.c
  55. 0
      libweston/vertex-clipping.h
  56. 0
      libweston/weston-egl-ext.h
  57. 0
      libweston/weston-launch.c
  58. 0
      libweston/weston-launch.h
  59. 0
      libweston/zoom.c
  60. 2
      tests/ivi_layout-internal-test.c
  61. 2
      tests/ivi_layout-test-plugin.c
  62. 2
      tests/surface-global-test.c
  63. 2
      tests/surface-test.c
  64. 2
      tests/vertex-clip-test.c
  65. 4
      tests/weston-test.c

@ -44,8 +44,8 @@ all-local : weston.ini ivi-shell/weston.ini
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/libweston \
-I$(top_builddir)/src \ -I$(top_builddir)/libweston \
-I$(top_builddir)/clients \ -I$(top_builddir)/clients \
-I$(top_builddir)/tests \ -I$(top_builddir)/tests \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
@ -70,38 +70,38 @@ libweston_la_LIBADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
libweston_la_LDFLAGS = -release ${LIBWESTON_ABI_VERSION} libweston_la_LDFLAGS = -release ${LIBWESTON_ABI_VERSION}
libweston_la_SOURCES = \ libweston_la_SOURCES = \
src/git-version.h \ libweston/git-version.h \
src/log.c \ libweston/log.c \
src/compositor.c \ libweston/compositor.c \
src/compositor.h \ libweston/compositor.h \
src/compositor-drm.h \ libweston/compositor-drm.h \
src/compositor-fbdev.h \ libweston/compositor-fbdev.h \
src/compositor-headless.h \ libweston/compositor-headless.h \
src/compositor-rdp.h \ libweston/compositor-rdp.h \
src/compositor-wayland.h \ libweston/compositor-wayland.h \
src/compositor-x11.h \ libweston/compositor-x11.h \
src/input.c \ libweston/input.c \
src/data-device.c \ libweston/data-device.c \
src/screenshooter.c \ libweston/screenshooter.c \
src/clipboard.c \ libweston/clipboard.c \
src/zoom.c \ libweston/zoom.c \
src/bindings.c \ libweston/bindings.c \
src/animation.c \ libweston/animation.c \
src/noop-renderer.c \ libweston/noop-renderer.c \
src/pixman-renderer.c \ libweston/pixman-renderer.c \
src/pixman-renderer.h \ libweston/pixman-renderer.h \
src/timeline.c \ libweston/timeline.c \
src/timeline.h \ libweston/timeline.h \
src/timeline-object.h \ libweston/timeline-object.h \
src/linux-dmabuf.c \ libweston/linux-dmabuf.c \
src/linux-dmabuf.h \ libweston/linux-dmabuf.h \
shared/helpers.h \ shared/helpers.h \
shared/matrix.c \ shared/matrix.c \
shared/matrix.h \ shared/matrix.h \
shared/timespec-util.h \ shared/timespec-util.h \
shared/zalloc.h \ shared/zalloc.h \
shared/platform.h \ shared/platform.h \
src/weston-egl-ext.h libweston/weston-egl-ext.h
if SYSTEMD_NOTIFY_SUPPORT if SYSTEMD_NOTIFY_SUPPORT
module_LTLIBRARIES += systemd-notify.la module_LTLIBRARIES += systemd-notify.la
@ -116,7 +116,7 @@ systemd_notify_la_SOURCES = \
compositor/systemd-notify.c \ compositor/systemd-notify.c \
shared/helpers.h \ shared/helpers.h \
shared/zalloc.h \ shared/zalloc.h \
src/compositor.h libweston/compositor.h
endif endif
nodist_libweston_la_SOURCES = \ nodist_libweston_la_SOURCES = \
@ -156,37 +156,37 @@ weston_SOURCES = \
# add BUILT_SOURCES to CLEANFILES, but we want to keep git-version.h # add BUILT_SOURCES to CLEANFILES, but we want to keep git-version.h
# in case we're building from tarballs. # 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 += \ noinst_LTLIBRARIES += \
libsession-helper.la libsession-helper.la
libsession_helper_la_SOURCES = \ libsession_helper_la_SOURCES = \
src/launcher-util.c \ libweston/launcher-util.c \
src/launcher-util.h \ libweston/launcher-util.h \
src/launcher-impl.h \ libweston/launcher-impl.h \
src/weston-launch.h \ libweston/weston-launch.h \
src/launcher-weston-launch.c \ libweston/launcher-weston-launch.c \
src/launcher-direct.c libweston/launcher-direct.c
libsession_helper_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS) libsession_helper_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS)
libsession_helper_la_LIBADD = $(LIBDRM_LIBS) libsession_helper_la_LIBADD = $(LIBDRM_LIBS)
if ENABLE_DBUS if ENABLE_DBUS
if HAVE_SYSTEMD_LOGIN if HAVE_SYSTEMD_LOGIN
libsession_helper_la_SOURCES += \ libsession_helper_la_SOURCES += \
src/dbus.h \ libweston/dbus.h \
src/dbus.c \ libweston/dbus.c \
src/launcher-logind.c libweston/launcher-logind.c
libsession_helper_la_CFLAGS += $(SYSTEMD_LOGIN_CFLAGS) $(DBUS_CFLAGS) libsession_helper_la_CFLAGS += $(SYSTEMD_LOGIN_CFLAGS) $(DBUS_CFLAGS)
libsession_helper_la_LIBADD += $(SYSTEMD_LOGIN_LIBS) $(DBUS_LIBS) libsession_helper_la_LIBADD += $(SYSTEMD_LOGIN_LIBS) $(DBUS_LIBS)
endif endif
endif endif
if HAVE_GIT_REPO 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)')\"" > $@ $(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 else
src/git-version.h : libweston/git-version.h :
$(AM_V_GEN)echo "#define BUILD_ID \"unknown (not built from git or tarball)\"" > $@ $(AM_V_GEN)echo "#define BUILD_ID \"unknown (not built from git or tarball)\"" > $@
endif endif
@ -195,7 +195,7 @@ endif
if BUILD_WESTON_LAUNCH if BUILD_WESTON_LAUNCH
bin_PROGRAMS += 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_CPPFLAGS = -DBINDIR='"$(bindir)"'
weston_launch_CFLAGS= \ weston_launch_CFLAGS= \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
@ -220,22 +220,22 @@ endif
endif # BUILD_WESTON_LAUNCH endif # BUILD_WESTON_LAUNCH
pkgconfigdir = $(libdir)/pkgconfig 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 wayland_sessiondir = $(datadir)/wayland-sessions
dist_wayland_session_DATA = compositor/weston.desktop dist_wayland_session_DATA = compositor/weston.desktop
libwestonincludedir = $(includedir)/libweston-${LIBWESTON_ABI_VERSION} libwestonincludedir = $(includedir)/libweston-${LIBWESTON_ABI_VERSION}
libwestoninclude_HEADERS = \ libwestoninclude_HEADERS = \
src/version.h \ libweston/version.h \
src/compositor.h \ libweston/compositor.h \
src/compositor-drm.h \ libweston/compositor-drm.h \
src/compositor-fbdev.h \ libweston/compositor-fbdev.h \
src/compositor-headless.h \ libweston/compositor-headless.h \
src/compositor-rdp.h \ libweston/compositor-rdp.h \
src/compositor-wayland.h \ libweston/compositor-wayland.h \
src/compositor-x11.h \ libweston/compositor-x11.h \
src/timeline-object.h \ libweston/timeline-object.h \
shared/matrix.h \ shared/matrix.h \
shared/config-parser.h \ shared/config-parser.h \
shared/zalloc.h \ shared/zalloc.h \
@ -259,10 +259,10 @@ gl_renderer_la_CFLAGS = \
$(GL_RENDERER_CFLAGS) \ $(GL_RENDERER_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
gl_renderer_la_SOURCES = \ gl_renderer_la_SOURCES = \
src/gl-renderer.h \ libweston/gl-renderer.h \
src/gl-renderer.c \ libweston/gl-renderer.c \
src/vertex-clipping.c \ libweston/vertex-clipping.c \
src/vertex-clipping.h \ libweston/vertex-clipping.h \
shared/helpers.h shared/helpers.h
endif endif
@ -279,17 +279,17 @@ x11_backend_la_CFLAGS = \
$(X11_COMPOSITOR_CFLAGS) \ $(X11_COMPOSITOR_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
x11_backend_la_SOURCES = \ x11_backend_la_SOURCES = \
src/compositor-x11.c \ libweston/compositor-x11.c \
src/compositor-x11.h \ libweston/compositor-x11.h \
shared/helpers.h shared/helpers.h
endif endif
INPUT_BACKEND_LIBS = $(LIBINPUT_BACKEND_LIBS) INPUT_BACKEND_LIBS = $(LIBINPUT_BACKEND_LIBS)
INPUT_BACKEND_SOURCES = \ INPUT_BACKEND_SOURCES = \
src/libinput-seat.c \ libweston/libinput-seat.c \
src/libinput-seat.h \ libweston/libinput-seat.h \
src/libinput-device.c \ libweston/libinput-device.c \
src/libinput-device.h \ libweston/libinput-device.h \
shared/helpers.h shared/helpers.h
if ENABLE_DRM_COMPOSITOR if ENABLE_DRM_COMPOSITOR
@ -308,16 +308,16 @@ drm_backend_la_CFLAGS = \
$(DRM_COMPOSITOR_CFLAGS) \ $(DRM_COMPOSITOR_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
drm_backend_la_SOURCES = \ drm_backend_la_SOURCES = \
src/compositor-drm.c \ libweston/compositor-drm.c \
src/compositor-drm.h \ libweston/compositor-drm.h \
$(INPUT_BACKEND_SOURCES) \ $(INPUT_BACKEND_SOURCES) \
shared/helpers.h \ shared/helpers.h \
shared/timespec-util.h \ shared/timespec-util.h \
src/libbacklight.c \ libweston/libbacklight.c \
src/libbacklight.h libweston/libbacklight.h
if ENABLE_VAAPI_RECORDER 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_LIBADD += $(LIBVA_LIBS)
drm_backend_la_CFLAGS += $(LIBVA_CFLAGS) drm_backend_la_CFLAGS += $(LIBVA_CFLAGS)
endif endif
@ -338,8 +338,8 @@ wayland_backend_la_CFLAGS = \
$(WAYLAND_COMPOSITOR_CFLAGS) \ $(WAYLAND_COMPOSITOR_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
wayland_backend_la_SOURCES = \ wayland_backend_la_SOURCES = \
src/compositor-wayland.c \ libweston/compositor-wayland.c \
src/compositor-wayland.h \ libweston/compositor-wayland.h \
shared/helpers.h shared/helpers.h
nodist_wayland_backend_la_SOURCES = \ nodist_wayland_backend_la_SOURCES = \
protocol/fullscreen-shell-unstable-v1-protocol.c \ 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_LIBADD = $(COMPOSITOR_LIBS) libshared.la
headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(AM_CFLAGS) headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(AM_CFLAGS)
headless_backend_la_SOURCES = \ headless_backend_la_SOURCES = \
src/compositor-headless.c \ libweston/compositor-headless.c \
src/compositor-headless.h \ libweston/compositor-headless.h \
shared/helpers.h shared/helpers.h
endif endif
@ -373,8 +373,8 @@ fbdev_backend_la_CFLAGS = \
$(PIXMAN_CFLAGS) \ $(PIXMAN_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
fbdev_backend_la_SOURCES = \ fbdev_backend_la_SOURCES = \
src/compositor-fbdev.c \ libweston/compositor-fbdev.c \
src/compositor-fbdev.h \ libweston/compositor-fbdev.h \
shared/helpers.h \ shared/helpers.h \
$(INPUT_BACKEND_SOURCES) $(INPUT_BACKEND_SOURCES)
endif endif
@ -390,8 +390,8 @@ rdp_backend_la_CFLAGS = \
$(RDP_COMPOSITOR_CFLAGS) \ $(RDP_COMPOSITOR_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
rdp_backend_la_SOURCES = \ rdp_backend_la_SOURCES = \
src/compositor-rdp.c \ libweston/compositor-rdp.c \
src/compositor-rdp.h \ libweston/compositor-rdp.h \
shared/helpers.h shared/helpers.h
endif endif
@ -422,11 +422,11 @@ noinst_PROGRAMS += spring-tool
spring_tool_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) spring_tool_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS)
spring_tool_LDADD = $(COMPOSITOR_LIBS) -lm spring_tool_LDADD = $(COMPOSITOR_LIBS) -lm
spring_tool_SOURCES = \ spring_tool_SOURCES = \
src/spring-tool.c \ libweston/spring-tool.c \
src/animation.c \ libweston/animation.c \
shared/matrix.c \ shared/matrix.c \
shared/matrix.h \ shared/matrix.h \
src/compositor.h libweston/compositor.h
if BUILD_CLIENTS if BUILD_CLIENTS
@ -607,8 +607,8 @@ weston_image_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
weston_cliptest_SOURCES = \ weston_cliptest_SOURCES = \
clients/cliptest.c \ clients/cliptest.c \
src/vertex-clipping.c \ libweston/vertex-clipping.c \
src/vertex-clipping.h libweston/vertex-clipping.h
weston_cliptest_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) weston_cliptest_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
weston_cliptest_LDADD = libtoytoolkit.la weston_cliptest_LDADD = libtoytoolkit.la
@ -837,8 +837,8 @@ module_LTLIBRARIES += desktop-shell.la
desktop_shell_la_CPPFLAGS = \ desktop_shell_la_CPPFLAGS = \
-I$(top_builddir)/protocol \ -I$(top_builddir)/protocol \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
-I$(top_srcdir)/src \ -I$(top_srcdir)/libweston \
-I$(top_builddir)/src \ -I$(top_builddir)/libweston \
-I$(top_builddir)/desktop-shell \ -I$(top_builddir)/desktop-shell \
-DDATADIR='"$(datadir)"' \ -DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \ -DMODULEDIR='"$(moduledir)"' \
@ -870,8 +870,8 @@ module_LTLIBRARIES += fullscreen-shell.la
fullscreen_shell_la_CPPFLAGS = \ fullscreen_shell_la_CPPFLAGS = \
-I$(top_builddir)/protocol \ -I$(top_builddir)/protocol \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
-I$(top_srcdir)/src \ -I$(top_srcdir)/libweston \
-I$(top_builddir)/src \ -I$(top_builddir)/libweston \
-DIN_WESTON -DIN_WESTON
fullscreen_shell_la_LDFLAGS = -module -avoid-version fullscreen_shell_la_LDFLAGS = -module -avoid-version
@ -960,8 +960,8 @@ module_LTLIBRARIES += xwayland.la
xwayland_la_CPPFLAGS = \ xwayland_la_CPPFLAGS = \
-I$(top_builddir)/protocol \ -I$(top_builddir)/protocol \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
-I$(top_srcdir)/src \ -I$(top_srcdir)/libweston \
-I$(top_builddir)/src \ -I$(top_builddir)/libweston \
-I$(top_builddir)/xwayland \ -I$(top_builddir)/xwayland \
-DDATADIR='"$(datadir)"' \ -DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \ -DMODULEDIR='"$(moduledir)"' \
@ -1184,8 +1184,8 @@ config_parser_test_CFLAGS = \
vertex_clip_test_SOURCES = \ vertex_clip_test_SOURCES = \
tests/vertex-clip-test.c \ tests/vertex-clip-test.c \
shared/helpers.h \ shared/helpers.h \
src/vertex-clipping.c \ libweston/vertex-clipping.c \
src/vertex-clipping.h libweston/vertex-clipping.h
vertex_clip_test_LDADD = libtest-runner.la -lm $(CLOCK_GETTIME_LIBS) vertex_clip_test_LDADD = libtest-runner.la -lm $(CLOCK_GETTIME_LIBS)
libtest_client_la_SOURCES = \ libtest_client_la_SOURCES = \
@ -1334,8 +1334,8 @@ if BUILD_SETBACKLIGHT
noinst_PROGRAMS += setbacklight noinst_PROGRAMS += setbacklight
setbacklight_SOURCES = \ setbacklight_SOURCES = \
tests/setbacklight.c \ tests/setbacklight.c \
src/libbacklight.c \ libweston/libbacklight.c \
src/libbacklight.h libweston/libbacklight.h
setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS) setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS)
setbacklight_LDADD = $(SETBACKLIGHT_LIBS) setbacklight_LDADD = $(SETBACKLIGHT_LIBS)
endif endif

@ -49,7 +49,7 @@
#include <linux/input.h> #include <linux/input.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "src/vertex-clipping.h" #include "libweston/vertex-clipping.h"
#include "shared/xalloc.h" #include "shared/xalloc.h"
#include "window.h" #include "window.h"

@ -633,11 +633,11 @@ if test "x$enable_systemd_notify" = "xyes"; then
PKG_CHECK_MODULES(SYSTEMD_DAEMON, [libsystemd]) PKG_CHECK_MODULES(SYSTEMD_DAEMON, [libsystemd])
fi 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 # 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 # 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]) AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])

@ -31,7 +31,7 @@
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#include "src/compositor.h" #include "compositor.h"
#include "ivi-shell/ivi-layout-export.h" #include "ivi-shell/ivi-layout-export.h"
#include "ivi-shell/ivi-layout-private.h" #include "ivi-shell/ivi-layout-private.h"
#include "ivi-test.h" #include "ivi-test.h"

@ -32,7 +32,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "src/compositor.h" #include "compositor.h"
#include "compositor/weston.h" #include "compositor/weston.h"
#include "weston-test-server-protocol.h" #include "weston-test-server-protocol.h"
#include "ivi-test.h" #include "ivi-test.h"

@ -27,7 +27,7 @@
#include <assert.h> #include <assert.h>
#include "src/compositor.h" #include "compositor.h"
static void static void
surface_to_from_global(void *data) surface_to_from_global(void *data)

@ -28,7 +28,7 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include "src/compositor.h" #include "compositor.h"
static void static void
surface_transform(void *data) surface_transform(void *data)

@ -31,7 +31,7 @@
#include "weston-test-runner.h" #include "weston-test-runner.h"
#include "shared/helpers.h" #include "shared/helpers.h"
#include "src/vertex-clipping.h" #include "vertex-clipping.h"
#define BOUNDING_BOX_TOP_Y 100.0f #define BOUNDING_BOX_TOP_Y 100.0f
#define BOUNDING_BOX_LEFT_X 50.0f #define BOUNDING_BOX_LEFT_X 50.0f

@ -31,14 +31,14 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include "src/compositor.h" #include "compositor.h"
#include "compositor/weston.h" #include "compositor/weston.h"
#include "weston-test-server-protocol.h" #include "weston-test-server-protocol.h"
#ifdef ENABLE_EGL #ifdef ENABLE_EGL
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include "src/weston-egl-ext.h" #include "weston-egl-ext.h"
#endif /* ENABLE_EGL */ #endif /* ENABLE_EGL */
#include "shared/helpers.h" #include "shared/helpers.h"

Loading…
Cancel
Save