fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-25 17:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename timeline-object.h to libweston/timeline-object.h

Browse source 
This patch sets up the stage for similarly renaming compositor.h which will
justify this. That patch will be big, so moving timeline-object.h first makes
it easy to see the changes to the build and install directives.

This and all the following moves essentially break the API, so libweston major
is bumped.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2019-03-28 16:35:56 +02:00
parent cb74afd482
commit a78cf77582
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/libweston/meson.build Normal file
View file

@ -0,0 +1,4 @@
install_headers(
'timeline-object.h',
subdir: dir_include_libweston_install
)

0
libweston/timeline-object.h → include/libweston/timeline-object.h
View file

1
include/meson.build Normal file
View file

@ -0,0 +1 @@
subdir('libweston')

2
libweston/compositor.h
View file

@ -44,7 +44,7 @@ extern "C" {
#include "matrix.h" #include "matrix.h"
#include "config-parser.h" #include "config-parser.h"
#include "zalloc.h" #include "zalloc.h"
#include "timeline-object.h" #include <libweston/timeline-object.h>
struct weston_geometry { struct weston_geometry {
int32_t x, y; int32_t x, y;

7
libweston/meson.build
View file

@ -59,7 +59,6 @@ srcs_libweston = [
install_headers( install_headers(
'compositor.h', 'compositor.h',
'plugin-registry.h', 'plugin-registry.h',
'timeline-object.h',
'windowed-output-api.h', 'windowed-output-api.h',
'../shared/config-parser.h', '../shared/config-parser.h',
'../shared/matrix.h', '../shared/matrix.h',
@ -78,7 +77,7 @@ endif
lib_weston = shared_library( lib_weston = shared_library(
'weston-@0@'.format(libweston_major), 'weston-@0@'.format(libweston_major),
srcs_libweston, srcs_libweston,
include_directories: include_directories('..', '../shared'), include_directories: [ include_directories('..', '../shared'), public_inc ],
link_args: [ '-Wl,-export-dynamic' ], link_args: [ '-Wl,-export-dynamic' ],
install: true, install: true,
version: '0.0.@0@'.format(libweston_revision), version: '0.0.@0@'.format(libweston_revision),
@ -88,7 +87,7 @@ lib_weston = shared_library(
dep_libweston = declare_dependency( dep_libweston = declare_dependency(
link_with: lib_weston, link_with: lib_weston,
include_directories: include_directories('.'), include_directories: [ include_directories('.'), public_inc ],
dependencies: deps_libweston dependencies: deps_libweston
) )
@ -97,7 +96,7 @@ dep_libweston = declare_dependency(
# https://github.com/mesonbuild/meson/pull/5167 # https://github.com/mesonbuild/meson/pull/5167
# in hopefully Meson 0.51. # in hopefully Meson 0.51.
dep_libweston_h = declare_dependency( dep_libweston_h = declare_dependency(
include_directories: include_directories('.'), include_directories: [ include_directories('.'), public_inc ],
dependencies: [ dependencies: [
dep_pixman.partial_dependency(compile_args: true), dep_pixman.partial_dependency(compile_args: true),
dep_xkbcommon.partial_dependency(compile_args: true), dep_xkbcommon.partial_dependency(compile_args: true),

6
meson.build
View file

@ -10,7 +10,7 @@ project('weston',
license: 'MIT/Expat', license: 'MIT/Expat',
) )
libweston_major = 6 libweston_major = 7
# libweston_revision is manufactured to follow the autotools build's # libweston_revision is manufactured to follow the autotools build's
# library file naming, thanks to libtool # library file naming, thanks to libtool
@ -31,6 +31,7 @@ dir_prefix = get_option('prefix')
dir_bin = join_paths(dir_prefix, get_option('bindir')) dir_bin = join_paths(dir_prefix, get_option('bindir'))
dir_data = join_paths(dir_prefix, get_option('datadir')) dir_data = join_paths(dir_prefix, get_option('datadir'))
dir_include_libweston = 'libweston-@0@'.format(libweston_major) dir_include_libweston = 'libweston-@0@'.format(libweston_major)
dir_include_libweston_install = join_paths(dir_include_libweston, 'libweston')
dir_lib = join_paths(dir_prefix, get_option('libdir')) dir_lib = join_paths(dir_prefix, get_option('libdir'))
dir_libexec = join_paths(dir_prefix, get_option('libexecdir')) dir_libexec = join_paths(dir_prefix, get_option('libexecdir'))
dir_module_weston = join_paths(dir_lib, 'weston') dir_module_weston = join_paths(dir_lib, 'weston')
@ -40,6 +41,8 @@ dir_lib_pc = join_paths(dir_lib, 'pkgconfig')
dir_man = join_paths(dir_prefix, get_option('mandir')) dir_man = join_paths(dir_prefix, get_option('mandir'))
dir_protocol_libweston = 'libweston/protocols' dir_protocol_libweston = 'libweston/protocols'
public_inc = include_directories('include')
pkgconfig = import('pkgconfig') pkgconfig = import('pkgconfig')
libweston_version_h = configuration_data() libweston_version_h = configuration_data()
@ -149,6 +152,7 @@ dep_libdrm = dependency('libdrm', version: '>= 2.4.68')
dep_libdrm_headers = dep_libdrm.partial_dependency(compile_args: true) dep_libdrm_headers = dep_libdrm.partial_dependency(compile_args: true)
dep_threads = dependency('threads') dep_threads = dependency('threads')
subdir('include')
subdir('protocol') subdir('protocol')
subdir('shared') subdir('shared')
subdir('libweston') subdir('libweston')