From dd800253b9b8ed135c499d89e296abec792065e7 Mon Sep 17 00:00:00 2001 From: Janos Kovacs Date: Sat, 5 Jul 2014 22:08:04 +0300 Subject: [PATCH] packaging: exporting .h and .a files for wayland client protocols. Change-Id: Ie03a031f8659c74c1b4810298037e2693a00c78e Signed-off-by: Janos Kovacs --- ivi-extension-protocol.pc.in | 10 ++++++++++ packaging/genivi-shell.spec | 29 ++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 ivi-extension-protocol.pc.in diff --git a/ivi-extension-protocol.pc.in b/ivi-extension-protocol.pc.in new file mode 100644 index 0000000..6ac2bef --- /dev/null +++ b/ivi-extension-protocol.pc.in @@ -0,0 +1,10 @@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @name@ +Description: native Wayland protocols to use Genivi Shell +Requires: weston +Version: @package_version@ +Libs: -L${libdir} -livi-extension-protocol +Cflags: -I${includedir} + diff --git a/packaging/genivi-shell.spec b/packaging/genivi-shell.spec index 1c91ec8..d62e9ce 100644 --- a/packaging/genivi-shell.spec +++ b/packaging/genivi-shell.spec @@ -25,6 +25,7 @@ manager client interface. Summary: Development files for package %{name} Group: Graphics & UI Framework/Development Requires: %{name} = %{version}-%{release} +Requires: pkgconfig(weston) >= 1.5 %description devel This package provides header files and other developer files needed for creating GENIVI layer manager clients. @@ -33,6 +34,16 @@ creating GENIVI layer manager clients. %setup -q cp %{SOURCE1001} . +/usr/bin/wayland-scanner code < protocol/ivi-controller.xml \ + > protocol/ivi-controller-protocol.c + +cat ivi-extension-protocol.pc.in \ + | sed s\#@libdir@\#%{_libdir}\#g \ + | sed s\#@includedir@\#%{_includedir}/%{name}\#g \ + | sed s\#@name@\#%{name}\#g \ + | sed s\#@package_version@\#%{version}\#g \ + > ivi-extension-protocol.pc + %cmake . %build @@ -42,6 +53,8 @@ make %{?_smp_mflags} V=1 %install %make_install +install -d %{buildroot}/%{_includedir}/%{name}/ +install -d %{buildroot}/%{_libdir}/pkgconfig/ install -d %{buildroot}/%{_datadir}/%{name}/protocol/ install -m 644 protocol/ivi-application.xml %{buildroot}/%{_datadir}/%{name}/protocol/ @@ -53,12 +66,24 @@ install -m 644 protocol/ivi-application-server-protocol.h \ install -m 644 protocol/ivi-application-protocol.c \ %{buildroot}/%{_datadir}/%{name}/protocol/ +install -m 644 protocol/ivi-application-client-protocol.h \ + %{buildroot}/%{_includedir}/%{name}/ + install -m 644 protocol/ivi-controller-server-protocol.h \ %{buildroot}/%{_datadir}/%{name}/protocol/ install -m 644 protocol/ivi-controller-protocol.c \ %{buildroot}/%{_datadir}/%{name}/protocol/ +install -m 644 protocol/ivi-controller-client-protocol.h \ + %{buildroot}/%{_includedir}/%{name}/ + +install -m 644 protocol/libivi-extension-protocol.a \ + %{buildroot}/%{_libdir}/ + +install -m 644 ivi-extension-protocol.pc \ + %{buildroot}/%{_libdir}/pkgconfig/ + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -80,10 +105,12 @@ install -m 644 protocol/ivi-controller-protocol.c \ %{_includedir}/ilm/ilm_control.h %{_includedir}/ilm/ilm_platform.h %{_includedir}/ilm/ilm_types.h +%{_includedir}/%{name}/*.h %{_libdir}/libilmClient.so %{_libdir}/libilmCommon.so %{_libdir}/libilmControl.so +%{_libdir}/libivi-extension-protocol.a +%{_libdir}/pkgconfig/ivi-extension-protocol.pc %{_datadir}/%{name}/protocol/*.xml %{_datadir}/%{name}/protocol/*.h %{_datadir}/%{name}/protocol/*.c - -- 2.7.4