shell: Fix build error

Change-Id: I2feae9320873baa5fb5fb1827c46337e604ac93e

diff --git a/configure.ac b/configure.ac
index 698f874b7c2b6a71c6e20e0d4a1ac8fa7bf5b047..ea3affbe9a7d140f2577ebae6b57f6164464f7d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -188,10 +188,8 @@ AC_SUBST(DOCTOR_LIBS)
 SHELL_CLIENT_REQUIRES="wayland-client pixman-1"
 PKG_CHECK_MODULES(SHELL_CLIENT, [$SHELL_CLIENT_REQUIRES])
 
-SHELL_CLIENT_CFLAGS="$PEPPER_DIR $PEPPER_DESKTOP_SHELL_DIR $SHELL_CLIENT_CFLAGS"
-
+SHELL_CLIENT_CFLAGS="$PEPPER_DIR $SHELL_CLIENT_CFLAGS"
 SHELL_CLIENT_LIBS="$PEPPER_LIB $PEPPER_LIBS $SHELL_CLIENT_LIBS"
-SHELL_CLIENT_LIBS="$PEPPER_DESKTOP_SHELL_LIB $PEPPER_DESKTOP_SHELL_LIBS $SHELL_CLIENT_LIBS"
 
 AC_SUBST(SHELL_CLIENT_CFLAGS)
 AC_SUBST(SHELL_CLIENT_LIBS)

diff --git a/packaging/pepper.spec b/packaging/pepper.spec
index 27ae02159434a55c94bdfcf5b9aebeba3376debc..39a82c3e58beca0ef417fc90779f7c38cda90205 100644 (file)
--- a/packaging/pepper.spec
+++ b/packaging/pepper.spec
@@ -194,10 +194,13 @@ make %{?_smp_mflags}
 %files desktop-shell
 %defattr(-,root,root,-)
 %{_libdir}/libpepper-desktop-shell.so.*
+%{_bindir}/shell-client
 
 %files desktop-shell-devel
 %defattr(-,root,root,-)
 %{_includedir}/pepper/pepper-desktop-shell.h
+%{_includedir}/pepper/pepper-shell-client-protocol.h
+%{_includedir}/pepper/xdg-shell-client-protocol.h
 %{_libdir}/pkgconfig/pepper-desktop-shell.pc
 %{_libdir}/libpepper-desktop-shell.so
 

diff --git a/src/lib/desktop-shell/Makefile.am b/src/lib/desktop-shell/Makefile.am
index 84885b55893645f597dc54f12e08ffd658dad7c9..5e1c4d56dd124a2f15aefd5a5bfddf08d09635a7 100644 (file)
--- a/src/lib/desktop-shell/Makefile.am
+++ b/src/lib/desktop-shell/Makefile.am
@@ -42,6 +42,6 @@ $(srcdir)/protocol/%-server-protocol.h : $(srcdir)/protocol/%.xml
 $(srcdir)/protocol/%-client-protocol.h : $(srcdir)/protocol/%.xml
        $(AM_V_GEN)$(wayland_scanner) client-header < $< > $@
 
-shell_client_CFLAGS = $(SHELL_CLIENT_CFLAGS)
-shell_client_LDADD = $(SHELL_CLIENT_LIBS)
+shell_client_CFLAGS = $(SHELL_CLIENT_CFLAGS) -I$(srcdir)/protocol/
+shell_client_LDADD = $(SHELL_CLIENT_LIBS) libpepper-desktop-shell.la
 shell_client_SOURCES = shell-client.c

diff --git a/src/lib/desktop-shell/shell-client.c b/src/lib/desktop-shell/shell-client.c
index fe6de790874112a41e8daefc0eb8ae05e6bf25e9..90af82d53de176326dc9fa9378aa7a74bcd67857 100644 (file)
--- a/src/lib/desktop-shell/shell-client.c
+++ b/src/lib/desktop-shell/shell-client.c
@@ -3,6 +3,7 @@
 #include <pepper-utils.h>
 #include <stdio.h>
 #include <sys/mman.h>
+#include <unistd.h>
 
 #define CURSOR_WIDTH    32
 #define CURSOR_HEIGHT   32
@@ -145,6 +146,8 @@ init_cursor(struct cursor *cursor, struct display *display)
 
     cursor->frame_done = 0;
     pepper_shell_set_cursor(display->shell, cursor->surface);
+
+    return 0;
 }
 
 static void