[PATCH weston 6/6] libweston: do not use weston version in libweston.pc

[Quentin Glidic]

On 04/07/2016 16:23, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  configure.ac              | 1 +
>  libweston/libweston.pc.in | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index be40f10..46b61ae 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -21,6 +21,7 @@ AC_SUBST([WESTON_VERSION_MINOR], [weston_minor_version])
>  AC_SUBST([WESTON_VERSION_MICRO], [weston_micro_version])
>  AC_SUBST([WESTON_VERSION], [weston_version])
>  AC_SUBST([LIBWESTON_MAJOR], [libweston_major_version])
> +AC_SUBST([LIBWESTON_VERSION], [libweston_major_version.libweston_minor_version.libweston_patch_version])

That makes packaging a pain. Although the whole libweston (supposedly 
parallel-installable) is already a pain.

When you have a project with a dep on libweston, you’ll have to dig the 
weston version because the tarball is versioned as weston.

I would only do that once (and if) we split libweston and weston to 
different repositories.


>  m4_define([lt_current], [libweston_minor_version])
>  m4_define([lt_revision], [libweston_patch_version])
>  m4_define([lt_age], [libweston_minor_version])
> diff --git a/libweston/libweston.pc.in b/libweston/libweston.pc.in
> index bb95af9..41ea8d7 100644
> --- a/libweston/libweston.pc.in
> +++ b/libweston/libweston.pc.in
> @@ -5,7 +5,7 @@ includedir=@includedir@
>
>  Name: libweston API
>  Description: Header files for libweston compositors development
> -Version: @WESTON_VERSION@
> +Version: @LIBWESTON_VERSION@
>  Requires.private: wayland-server pixman-1 xkbcommon
>  Cflags: -I${includedir}
>  Libs: -L${libdir} -lweston- at LIBWESTON_ABI_VERSION@
>


-- 

Quentin “Sardem FF7” Glidic