On Mon, 23 Oct 2017 10:04:16 +0200 Quentin Glidic <[email protected]> wrote:
> On 10/23/17 8:55 AM, Pekka Paalanen wrote: > > Hi, > > > > I'm CC'ing Quentin for the automake comments below. > > > >> diff --git a/Makefile.am b/Makefile.am > >> index 1d3eedb..026cc58 100644 > >> --- a/Makefile.am > >> +++ b/Makefile.am > >> @@ -116,6 +116,10 @@ libweston_@LIBWESTON_MAJOR@_la_SOURCES = > >> \ > >> shared/platform.h \ > >> shared/weston-egl-ext.h > >> > >> +libweston_@LIBWESTON_MAJOR@_datadir = $(datadir)/weston/protocols > >> +dist_libweston_@LIBWESTON_MAJOR@_data_DATA = \ > >> + protocol/weston-debug.xml > >> + > > > > wayland-protocols uses nobase_dist_pkgdata_DATA for this, is there a > > difference? What is the exact correct form? > > nobase_ would put the file in $(datadir)/weston/protocols/protocol, > wayland-protocols repo is mirroring the installation tree, here, nobase_ > would be wrong. > Good, somehow I got the meaning of nobase got flipped in my mind. It does indeed install to the right location already. > > >> lib_LTLIBRARIES += libweston-desktop-@[email protected] > >> libweston_desktop_@LIBWESTON_MAJOR@_la_CPPFLAGS = $(AM_CPPFLAGS) > >> -DIN_WESTON > >> libweston_desktop_@LIBWESTON_MAJOR@_la_CFLAGS = $(AM_CFLAGS) > >> $(COMPOSITOR_CFLAGS) > >> @@ -166,6 +170,8 @@ endif > >> nodist_libweston_@LIBWESTON_MAJOR@_la_SOURCES = > >> \ > >> protocol/weston-screenshooter-protocol.c \ > >> protocol/weston-screenshooter-server-protocol.h \ > >> + protocol/weston-debug-protocol.c \ > >> + protocol/weston-debug-server-protocol.h \ > >> protocol/text-cursor-position-protocol.c \ > >> protocol/text-cursor-position-server-protocol.h \ > >> protocol/text-input-unstable-v1-protocol.c \ > >> @@ -283,6 +289,7 @@ endif # BUILD_WESTON_LAUNCH > >> pkgconfigdir = $(libdir)/pkgconfig > >> pkgconfig_DATA = \ > >> libweston/libweston-${LIBWESTON_MAJOR}.pc \ > >> + libweston/libweston-${LIBWESTON_MAJOR}-protocols.pc \ > > > > Should the protocol.pc not go into noarch? > > wayland-protocols does noarch_pkgconfig_DATA = wayland-protocols.pc. > > Oh, yes it should. Using PKG_NOARCH_INSTALLDIR would be nice too (but we > don’t use PKG_INSTALLDIR, and Meson doesn’t have equivalents so may not > be worth it). > Ok, so I'll simply turn this into: noarch_pkgconfig_DATA = libweston/libweston-${LIBWESTON_MAJOR}-protocols.pc I suppose I also need to add PKG_NOARCH_INSTALLDIR to configure.ac. I made these changes and the .pc file fix and the updated patch can be seen at: https://gitlab.collabora.com/pq/weston/commit/cd67596949c36d2226d88a1f82045c6bad93026f > >> diff --git a/libweston/libweston-protocols.pc.in > >> b/libweston/libweston-protocols.pc.in > >> new file mode 100644 > >> index 0000000..46fd586 > >> --- /dev/null > >> +++ b/libweston/libweston-protocols.pc.in > >> @@ -0,0 +1,7 @@ > >> +prefix=@prefix@ > >> +datarootdir=@datarootdir@ > >> +pkgdatadir=@datadir@/@PACKAGE@/protocols > > > > In wayland-protocols we have > > > > pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ > > > > so I think this here should be > > > > pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@/protocols > > I still think we should just drop it in prefix, as pkg-config will strip > it when necessary, but hey. :-) > Ah well, I'll prefer to follow the example from wayland-protocols if both work. > > >> + > >> +Name: libWeston Protocols > >> +Description: libWeston protocol files > >> +Version: @WESTON_VERSION@ > >> diff --git a/protocol/weston-debug.xml b/protocol/weston-debug.xml > >> new file mode 100644 > > > > All good otherwise in this patch. If someone tells me the answers to my > > questions above, I can do the fixups when I land this patch. Thanks, pq
pgpEzck_XZv6t.pgp
Description: OpenPGP digital signature
_______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
