summaryrefslogtreecommitdiff
path: root/ivi-shell
diff options
context:
space:
mode:
authorGiulio Camuffo <giuliocamuffo@gmail.com>2016-06-02 21:48:14 +0300
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2016-06-03 13:17:18 +0300
commit179fcda31f6b95f7bfb270574a597ef25dbd503b (patch)
treeeae010e9361d3bff421d287b4906ae6192bea9e9 /ivi-shell
parentbe2b11a7c01e5fd8cd5b17729d4eae76217d8280 (diff)
Split the modules and include files between weston and libweston
The backends are now installed in lib/libweston-0, and the include files that will be used by libweston in include/libweston-0. The other modules and weston-specific include files are kept in the old paths. A new wet_load_module() is added to load plugins in the old path, which is not part of libweston, but weston only and defined in main.c. To allow that to be used by out of tree weston plugins, the function is declared in a new weston.h, installed in include/weston. The -0 in the paths is the abi version of libweston, and it will also be used by the libweston .so. If the abi changes the number will need to be increased. Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'ivi-shell')
-rw-r--r--ivi-shell/ivi-layout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 9661378a..81e5621b 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -60,6 +60,7 @@
#include <string.h>
#include <assert.h>
+#include "weston.h"
#include "compositor.h"
#include "ivi-shell.h"
#include "ivi-layout-export.h"
@@ -2071,7 +2072,7 @@ load_controller_modules(struct weston_compositor *compositor, const char *module
end = strchrnul(p, ',');
snprintf(buffer, sizeof buffer, "%.*s", (int)(end - p), p);
- controller_module_init = weston_load_module(buffer, "controller_module_init");
+ controller_module_init = wet_load_module(buffer, "controller_module_init");
if (!controller_module_init)
return -1;