diff options
| author | Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> | 2014-12-15 13:22:31 +0900 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-12-15 16:43:55 +0200 |
| commit | 28dc18c8433a52d8052850910cd5dd1c4c7ea6fc (patch) | |
| tree | 5864ffb48bbe4dd1e75d31b01c581ecdd8f2ba1b /Makefile.am | |
| parent | 3c6796ff3200e12c0e7ffc70a287e7ea2e218ca1 (diff) | |
| download | weston-28dc18c8433a52d8052850910cd5dd1c4c7ea6fc.tar.gz weston-28dc18c8433a52d8052850910cd5dd1c4c7ea6fc.tar.bz2 weston-28dc18c8433a52d8052850910cd5dd1c4c7ea6fc.zip | |
ivi-shell: make ivi-layout.c as a part of ivi-shell.so
ivi-layout.so is separately built and loaded by using dlopen with
RTLD_GLOBAL. This was because these apis defined in ivi-layout.so shall
be used by ivi-modules; e.g. hmi-controller. This shall be improved that
a struct ivi_layout_api contains the whole exported API as function
pointers to be exposed as module_init.
This patch alone builds, but loading controller modules at runtime
failes. This failure will be fixed by following patches.
Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 494266d2..3a37be05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -771,28 +771,20 @@ endif if ENABLE_IVI_SHELL module_LTLIBRARIES += \ - $(ivi_layout) \ $(ivi_shell) \ $(hmi_controller) -ivi_layout = ivi-layout.la -ivi_layout_la_LDFLAGS = -module -avoid-version -ivi_layout_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la -ivi_layout_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) -ivi_layout_la_SOURCES = \ - ivi-shell/ivi-layout-export.h \ - ivi-shell/ivi-layout-private.h \ - ivi-shell/ivi-layout.c \ - ivi-shell/ivi-layout-transition.c - ivi_shell = ivi-shell.la ivi_shell_la_LDFLAGS = -module -avoid-version ivi_shell_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la ivi_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) ivi_shell_la_SOURCES = \ + ivi-shell/ivi-layout-export.h \ + ivi-shell/ivi-layout-private.h \ + ivi-shell/ivi-layout.c \ + ivi-shell/ivi-layout-transition.c \ ivi-shell/ivi-shell.h \ ivi-shell/ivi-shell.c \ - ivi-shell/ivi-layout-private.h \ ivi-shell/input-panel-ivi.c nodist_ivi_shell_la_SOURCES = \ protocol/ivi-application-protocol.c \ |