summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-02-05 14:24:24 -0800
committerCedric BAIL <cedric@osg.samsung.com>2018-05-01 10:39:01 -0700
commitc51a425ee5a74ecfa23798eff3fabdc5e32d2602 (patch)
treead6bd92034f3fc5f3d2fbd0787ed7ac2b80c9edd /src
parent16d5caa2eea214473d8a211202316e1ae4eb89ab (diff)
ecore_evas: fix vnc_server build.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Ecore_Evas.am23
-rw-r--r--src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c11
-rw-r--r--src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c2
3 files changed, 9 insertions, 27 deletions
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index dea5608a0d..29bcea3f06 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -271,7 +271,8 @@ endif
271 271
272if BUILD_ECORE_EVAS_VNC_SERVER 272if BUILD_ECORE_EVAS_VNC_SERVER
273VNCSERVERSOURCES = \ 273VNCSERVERSOURCES = \
274modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c 274modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c \
275modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c
275ecoreevasenginevncserverpkgdir = $(libdir)/ecore_evas/vnc_server/$(MODULE_ARCH) 276ecoreevasenginevncserverpkgdir = $(libdir)/ecore_evas/vnc_server/$(MODULE_ARCH)
276ecoreevasenginevncserverpkg_LTLIBRARIES = modules/ecore_evas/vnc_server/module.la 277ecoreevasenginevncserverpkg_LTLIBRARIES = modules/ecore_evas/vnc_server/module.la
277 278
@@ -282,26 +283,16 @@ $(install_ecoreevasenginevncserverpkgLTLIBRARIES): install-libLTLIBRARIES
282 283
283modules_ecore_evas_vnc_server_module_la_SOURCES = $(VNCSERVERSOURCES) 284modules_ecore_evas_vnc_server_module_la_SOURCES = $(VNCSERVERSOURCES)
284modules_ecore_evas_vnc_server_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 285modules_ecore_evas_vnc_server_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
285@ECORE_EVAS_CFLAGS@ \ 286-I$(top_builddir)/src/lib/ecore_fb \
286@LIBVNCSERVER_CFLAGS@ 287@LIBVNCSERVER_CFLAGS@ \
288@ECORE_EVAS_CFLAGS@
287modules_ecore_evas_vnc_server_module_la_LIBADD = \ 289modules_ecore_evas_vnc_server_module_la_LIBADD = \
288@USE_ECORE_EVAS_LIBS@ \ 290@LIBVNCSERVER_LIBS@ \
289@LIBVNCSERVER_LIBS@ 291@USE_ECORE_EVAS_LIBS@
290modules_ecore_evas_vnc_server_module_la_DEPENDENCIES = \ 292modules_ecore_evas_vnc_server_module_la_DEPENDENCIES = \
291@USE_ECORE_EVAS_INTERNAL_LIBS@ 293@USE_ECORE_EVAS_INTERNAL_LIBS@
292modules_ecore_evas_vnc_server_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 294modules_ecore_evas_vnc_server_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
293modules_ecore_evas_vnc_server_module_la_LIBTOOLFLAGS = --tag=disable-static 295modules_ecore_evas_vnc_server_module_la_LIBTOOLFLAGS = --tag=disable-static
294if BUILD_ECORE_EVAS_FB
295modules_ecore_evas_vnc_server_module_la_CPPFLAGS += @ECORE_FB_CFLAGS@ -I$(top_srcdir)/src/modules/evas/engines/fb
296modules_ecore_evas_vnc_server_module_la_LIBADD += @USE_ECORE_FB_LIBS@
297VNCSERVERSOURCES += \
298modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c \
299modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.h
300endif
301if BUILD_ECORE_EVAS_X11
302modules_ecore_evas_vnc_server_module_la_LIBADD += @USE_ECORE_X_LIBS@
303modules_ecore_evas_vnc_server_module_la_CPPFLAGS += @ECORE_X_CFLAGS@ -I$(top_srcdir)/src/modules/evas/engines/software_x11
304endif
305endif 296endif
306 297
307### Binary 298### Binary
diff --git a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
index 3b43c607af..c2a392400c 100644
--- a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
+++ b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c
@@ -12,16 +12,6 @@
12#include <Evas.h> 12#include <Evas.h>
13#include <Ecore_Evas.h> 13#include <Ecore_Evas.h>
14 14
15#ifdef BUILD_ENGINE_SOFTWARE_X11
16# include <Evas_Engine_Software_X11.h>
17# include <Ecore_X.h>
18#endif
19
20#ifdef BUILD_ENGINE_FB
21# include <Evas_Engine_FB.h>
22# include "ecore_evas_vnc_server_fb_keymap.h"
23#endif
24
25#include <time.h> 15#include <time.h>
26#include <stdio.h> 16#include <stdio.h>
27#include <stdlib.h> 17#include <stdlib.h>
@@ -29,6 +19,7 @@
29 19
30#include "ecore_private.h" 20#include "ecore_private.h"
31#include "ecore_evas_private.h" 21#include "ecore_evas_private.h"
22#include "ecore_evas_vnc_server_fb_keymap.h"
32 23
33static int _ecore_evas_vnc_server_log_dom; 24static int _ecore_evas_vnc_server_log_dom;
34static unsigned int _available_seat = 1; 25static unsigned int _available_seat = 1;
diff --git a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c
index 393693cd98..636026f4b1 100644
--- a/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c
+++ b/src/modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c
@@ -6,7 +6,7 @@
6 6
7static const char *_ecore_fb_li_kbd_syms[144 * 7] = 7static const char *_ecore_fb_li_kbd_syms[144 * 7] =
8{ 8{
9#include <ecore_fb_keytable.h> 9#include "ecore_fb_keytable.h"
10}; 10};
11 11
12#include "ecore_evas_vnc_server_fb_keymap.h" 12#include "ecore_evas_vnc_server_fb_keymap.h"