Move libweston-desktop.h

This too is a public installed header.

The public headers are moved under a new top-level directory include/ to make
them clearly stand out as special (public API).

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
dev
Pekka Paalanen 6 years ago
parent e04159b238
commit 8ebd9817e7
  1. 2
      desktop-shell/shell.c
  2. 0
      include/libweston-desktop/libweston-desktop.h
  3. 5
      include/meson.build
  4. 2
      ivi-shell/ivi-layout-private.h
  5. 2
      ivi-shell/ivi-shell.h
  6. 2
      libweston-desktop/client.c
  7. 2
      libweston-desktop/libweston-desktop.c
  8. 2
      libweston-desktop/meson.build
  9. 2
      libweston-desktop/seat.c
  10. 2
      libweston-desktop/surface.c
  11. 2
      libweston-desktop/wl-shell.c
  12. 2
      libweston-desktop/xdg-shell-v6.c
  13. 2
      libweston-desktop/xdg-shell.c
  14. 2
      libweston-desktop/xwayland.c
  15. 2
      tests/weston-test-desktop-shell.c

@ -42,7 +42,7 @@
#include <libweston/config-parser.h> #include <libweston/config-parser.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include "libweston-desktop/libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
#define DEFAULT_NUM_WORKSPACES 1 #define DEFAULT_NUM_WORKSPACES 1
#define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200 #define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200

@ -1 +1,6 @@
subdir('libweston') subdir('libweston')
install_headers(
'libweston-desktop/libweston-desktop.h',
subdir: join_paths(dir_include_libweston, 'libweston-desktop')
)

@ -30,7 +30,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "ivi-layout-export.h" #include "ivi-layout-export.h"
#include "libweston-desktop/libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
struct ivi_layout_view { struct ivi_layout_view {
struct wl_list link; /* ivi_layout::view_list */ struct wl_list link; /* ivi_layout::view_list */

@ -30,7 +30,7 @@
#include <stdint.h> #include <stdint.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "libweston-desktop/libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
struct ivi_shell struct ivi_shell
{ {

@ -28,7 +28,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
#include "internal.h" #include "internal.h"
struct weston_desktop_client { struct weston_desktop_client {

@ -32,7 +32,7 @@
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include "helpers.h" #include "helpers.h"
#include "libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
#include "internal.h" #include "internal.h"

@ -25,8 +25,6 @@ dep_lib_desktop = declare_dependency(
dependencies: dep_libweston dependencies: dep_libweston
) )
install_headers('libweston-desktop.h', subdir: dir_include_libweston)
pkgconfig.generate( pkgconfig.generate(
lib_desktop, lib_desktop,
filebase: 'libweston-desktop-@0@'.format(libweston_major), filebase: 'libweston-desktop-@0@'.format(libweston_major),

@ -33,7 +33,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
#include "internal.h" #include "internal.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"

@ -31,7 +31,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
#include "internal.h" #include "internal.h"
struct weston_desktop_view { struct weston_desktop_view {

@ -33,7 +33,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
#include "internal.h" #include "internal.h"
#define WD_WL_SHELL_PROTOCOL_VERSION 1 #define WD_WL_SHELL_PROTOCOL_VERSION 1

@ -35,7 +35,7 @@
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include "xdg-shell-unstable-v6-server-protocol.h" #include "xdg-shell-unstable-v6-server-protocol.h"
#include "libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
#include "internal.h" #include "internal.h"
#define WD_XDG_SHELL_PROTOCOL_VERSION 1 #define WD_XDG_SHELL_PROTOCOL_VERSION 1

@ -35,7 +35,7 @@
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include "xdg-shell-server-protocol.h" #include "xdg-shell-server-protocol.h"
#include "libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
#include "internal.h" #include "internal.h"
/************************************************************************************ /************************************************************************************

@ -33,7 +33,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
#include "internal.h" #include "internal.h"
#include "xwayland/xwayland-internal-interface.h" #include "xwayland/xwayland-internal-interface.h"

@ -39,7 +39,7 @@
#include "compositor/weston.h" #include "compositor/weston.h"
#include <libweston/config-parser.h> #include <libweston/config-parser.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "libweston-desktop/libweston-desktop.h" #include <libweston-desktop/libweston-desktop.h>
struct desktest_shell { struct desktest_shell {
struct wl_listener compositor_destroy_listener; struct wl_listener compositor_destroy_listener;

Loading…
Cancel
Save