[PATCH weston 2/6] Split the modules and include files between weston and libweston

[Quentin Glidic]

On 24/05/2016 18:59, Giulio Camuffo wrote:
> The backends are now installed in lib/libweston-0, and the include
> files that will be used by libweston in include/libweston-0. The other
> modules and weston-specific include files are kept in the old paths.
> A new load_weston_module() is added to load plugins in the old path,
> which is not part of libweston, but weston only and defined in main.c.
> To allow that to be used by out of tree weston plugins, the function
> is declared in a new weston.h, installed in include/weston.
>
> The -0 in the paths is the abi version of libweston, and it will be
> used by the libweston .so too. When the abi change the number will
> be increased.
>
> Signed-off-by: Giulio Camuffo <giuliocamuffo at gmail.com>
> ---
>  Makefile.am            | 28 +++++++++++++++++-----------
>  configure.ac           |  2 ++
>  ivi-shell/ivi-layout.c |  3 ++-
>  src/compositor.c       |  2 +-
>  src/main.c             | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
>  src/weston.h           | 40 ++++++++++++++++++++++++++++++++++++++++
>  src/weston.pc.in       |  2 +-
>  7 files changed, 109 insertions(+), 15 deletions(-)
>  create mode 100644 src/weston.h
>
> diff --git a/Makefile.am b/Makefile.am
> index 00b74e5..da37526 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -5,6 +5,8 @@ noinst_PROGRAMS =
>  libexec_PROGRAMS =
>  moduledir = $(libdir)/weston
>  module_LTLIBRARIES =
> +libweston_moduledir = $(libdir)/libweston-${LIBWESTON_ABI_VERSION}
> +libweston_module_LTLIBRARIES =
>  noinst_LTLIBRARIES =
>  BUILT_SOURCES =
>
> @@ -49,7 +51,7 @@ AM_CPPFLAGS = 					\
>  	-I$(top_srcdir)/shared			\
>  	-I$(top_builddir)/protocol		\
>  	-DDATADIR='"$(datadir)"'		\
> -	-DMODULEDIR='"$(moduledir)"'		\
> +	-DLIBWESTON_MODULEDIR='"$(libweston_moduledir)"' \

You are removing MODULEDIR here, but you re-add usage for it in main.c, 
does it work for real?


>  	-DLIBEXECDIR='"$(libexecdir)"'		\
>  	-DBINDIR='"$(bindir)"'
>
> @@ -95,6 +97,7 @@ weston_SOURCES =					\
>  	src/main.c					\
>  	src/linux-dmabuf.c				\
>  	src/linux-dmabuf.h				\
> +	src/weston.h					\
>  	shared/helpers.h				\
>  	shared/matrix.c					\
>  	shared/matrix.h					\
> @@ -104,7 +107,7 @@ weston_SOURCES =					\
>  	src/weston-egl-ext.h
>
>  if SYSTEMD_NOTIFY_SUPPORT
> -module_LTLIBRARIES += systemd-notify.la
> +libweston_module_LTLIBRARIES += systemd-notify.la

This module is loaded through weston --modules or weston.ini. So it will 
call load_weston_module, which looks in moduledir, not 
libweston_moduledir. Am I missing something?
This is the same as xwayland, and you didn’t change xwayland.


The rest is good.

Cheers,

-- 

Quentin “Sardem FF7” Glidic