[PATCH weston v2 4/4] weston.pc: Provide moduledir

[Pekka Paalanen]

On Fri,  7 Jun 2013 10:46:44 +0200
Quentin Glidic <sardemff7+wayland at sardemff7.net> wrote:

> From: Quentin Glidic <sardemff7+git at sardemff7.net>
> 
> This allows modules to use the correct directory for the targeted Weston
> to install themselves.
> 
> Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
> ---
>  configure.ac             | 4 ++++
>  src/Makefile.am          | 1 -
>  src/weston.pc.in         | 2 ++
>  src/xwayland/Makefile.am | 1 -
>  4 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index b625221..4671e78 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -378,6 +378,10 @@ AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
>  
>  WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol'])
>  
> +# Define the module directory here
> +moduledir='${libdir}/weston'
> +AC_SUBST([moduledir])
> +
>  AC_CONFIG_FILES([Makefile
>  		 shared/Makefile
>  		 src/Makefile
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 106ccba..3d91b4d 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -94,7 +94,6 @@ westoninclude_HEADERS =				\
>  	../shared/matrix.h			\
>  	../shared/config-parser.h
>  
> -moduledir = $(libdir)/weston
>  module_LTLIBRARIES =				\
>  	$(desktop_shell)			\
>  	$(tablet_shell)				\
> diff --git a/src/weston.pc.in b/src/weston.pc.in
> index 7a09938..9f17136 100644
> --- a/src/weston.pc.in
> +++ b/src/weston.pc.in
> @@ -5,6 +5,8 @@ includedir=@includedir@
>  libexecdir=@libexecdir@
>  pkglibexecdir=${libexecdir}/@PACKAGE@
>  
> +moduledir=@moduledir@
> +
>  Name: Weston Plugin API
>  Description: Header files for Weston plugin development
>  Version: @WESTON_VERSION@
> diff --git a/src/xwayland/Makefile.am b/src/xwayland/Makefile.am
> index 3a26cbd..1f8ee5c 100644
> --- a/src/xwayland/Makefile.am
> +++ b/src/xwayland/Makefile.am
> @@ -6,7 +6,6 @@ AM_CPPFLAGS =					\
>  	-DLIBEXECDIR='"$(libexecdir)"'		\
>  	-DXSERVER_PATH='"@XSERVER_PATH@"'
>  
> -moduledir = @libdir@/weston
>  module_LTLIBRARIES = xwayland.la
>  
>  xwayland = xwayland.la

Hi,

patches 3 and 4 together produce this:

$ pkg-config --cflags weston
-I/home/pq/local/include -I/usr/include/pixman-1 
$ pkg-config --libs weston

$ pkg-config --variable=moduledir weston
/home/pq/local/lib/weston

I have libxkbcommon installed with prefix=/home/pq/local, and pixman
from distro package. The --cflags and --libs seem to do the right thing
for out-of-tree weston plugins.

moduledir looks right, too, so good to go, I believe.


Thanks,
pq