Re: [PATCH weston v3] build: add -uninstalled.pc.in files for libweston and libweston-desktop

[Daniel Stone]

Hey Derek, Reynaldo,

On 7 September 2016 at 18:58, Derek Foreman  wrote:
> diff --git a/libweston-desktop/libweston-desktop-uninstalled.pc.in 
> b/libweston-desktop/libweston-desktop-uninstalled.pc.in
> new file mode 100644
> index 000..04af505
> --- /dev/null
> +++ b/libweston-desktop/libweston-desktop-uninstalled.pc.in
> @@ -0,0 +1,9 @@
> +libdir=@abs_builddir@/.libs
> +includedir=@abs_srcdir@
> +
> +Name: libweston-desktop
> +Description: Desktop shells abstraction library for libweston compositors 
> (not installed)
> +Version: @WESTON_VERSION@
> +Requires.private: libweston-@LIBWESTON_MAJOR@ wayland-server

This should be libweston-uninstalled, so we don't pick up the wrong version.

Cheers,
Daniel
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH weston v3] build: add -uninstalled.pc.in files for libweston and libweston-desktop

[Derek Foreman]

From: "Reynaldo H. Verdejo Pinochet" 

-uninstalled.pc files are a pkg-config facility for working with
uninstalled libraries.

With pkg-config, foo-uninstalled.pc overrides foo.pc.  foo-uninstalled.pc
should never be installed, and will be generated with references to the
build directory.

If you set up your environment so pkg-config looks for pc files in your
build directories you can use this to build and link against libraries
you haven't installed with "make install".

This can save time and space over installing with a prefix.

Signed-off-by: Reynaldo H. Verdejo Pinochet 
Acked-by: Bryce Harrington 
Signed-off-by: Derek Foreman 
---
Changes from v2:
Change the commit log to explain what these files are for

Changes from v1:
Don't put the version # in the -uninstalled.pc name
add libweston-desktop-uninstalled.pc.in



 configure.ac  | 2 ++
 libweston-desktop/libweston-desktop-uninstalled.pc.in | 9 +
 libweston/libweston-uninstalled.pc.in | 9 +
 3 files changed, 20 insertions(+)
 create mode 100644 libweston-desktop/libweston-desktop-uninstalled.pc.in
 create mode 100644 libweston/libweston-uninstalled.pc.in

diff --git a/configure.ac b/configure.ac
index 076b336..f7289fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -678,7 +678,9 @@ 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
 # libweston_abi_version here, and outside [] because of m4 quoting rules
 
AC_CONFIG_FILES([libweston/libweston-]libweston_major_version[.pc:libweston/libweston.pc.in])
+AC_CONFIG_FILES([libweston/libweston-]libweston_major_version[-uninstalled.pc:libweston/libweston-uninstalled.pc.in])
 
AC_CONFIG_FILES([libweston-desktop/libweston-desktop-]libweston_major_version[.pc:libweston-desktop/libweston-desktop.pc.in])
+AC_CONFIG_FILES([libweston-desktop/libweston-desktop-]libweston_major_version[-uninstalled.pc:libweston-desktop/libweston-desktop-uninstalled.pc.in])
 
 AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])
 
diff --git a/libweston-desktop/libweston-desktop-uninstalled.pc.in 
b/libweston-desktop/libweston-desktop-uninstalled.pc.in
new file mode 100644
index 000..04af505
--- /dev/null
+++ b/libweston-desktop/libweston-desktop-uninstalled.pc.in
@@ -0,0 +1,9 @@
+libdir=@abs_builddir@/.libs
+includedir=@abs_srcdir@
+
+Name: libweston-desktop
+Description: Desktop shells abstraction library for libweston compositors (not 
installed)
+Version: @WESTON_VERSION@
+Requires.private: libweston-@LIBWESTON_MAJOR@ wayland-server
+Cflags: -I${includedir}/libweston-desktop
+Libs: -L${libdir} -lweston-desktop-@LIBWESTON_MAJOR@
diff --git a/libweston/libweston-uninstalled.pc.in 
b/libweston/libweston-uninstalled.pc.in
new file mode 100644
index 000..4b4e885
--- /dev/null
+++ b/libweston/libweston-uninstalled.pc.in
@@ -0,0 +1,9 @@
+libdir=@abs_builddir@/.libs
+includedir=@abs_srcdir@
+
+Name: libweston API
+Description: Header files for libweston compositors development (not installed)
+Version: @WESTON_VERSION@
+Requires.private: wayland-server pixman-1 xkbcommon
+Cflags: -I${includedir}/libweston
+Libs: -L${libdir} -lweston-@LIBWESTON_MAJOR@
-- 
2.9.3

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel