X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor-uv%2FMakefile.am;h=24c11754ed8d0cc4120d7495574ba41b58a188c5;hb=db3a0f0d0a95c45423b6e2d87885fabf3037b64e;hp=630f9b6576166252edd3c2d2bc0e2ee15b8e5b6b;hpb=2e4e00e3217d1c88a0f671db3b18be5ad86e76fc;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am
old mode 100644
new mode 100755
index 630f9b6..24c1175
--- a/build/tizen/adaptor-uv/Makefile.am
+++ b/build/tizen/adaptor-uv/Makefile.am
@@ -88,10 +88,6 @@ adaptor_tv_dir = ../../../adaptors/tv
 include ../../../adaptors/tv/file.list
 endif
 
-# IVI
-adaptor_mobile_dir = ../../../adaptors/mobile
-include ../../../adaptors/mobile/file.list
-
 # Public API
 adaptor_public_api_dir = ../../../adaptors/public-api
 include ../../../adaptors/public-api/file.list
@@ -323,7 +319,7 @@ libdali_adaptor_uv_la_includes += \
                       -I../../../adaptors/ecore/wayland
 else
 libdali_adaptor_uv_la_includes += -I../../../adaptors/wayland \
-                               -I../../../adaptors/wayland/imf \
+                               -I../../../adaptors/wayland/input/text/imf \
                                -I../../../adaptors/wayland/clipboard \
                                -I../../../adaptors/wayland/native-image
 endif # USE_ECORE_WAYLAND
@@ -360,6 +356,7 @@ libdali_adaptor_uv_la_CXXFLAGS = \
                       -DFONT_DOWNLOADED_PATH="\"${fontDownloadedPath}\"" \
                       -DFONT_APPLICATION_PATH="\"${fontApplicationPath}\"" \
                       -DFONT_CONFIGURATION_FILE="\"${fontConfigurationFile}\"" \
+                      -DTIZEN_PLATFORM_CONFIG_SUPPORTED=${tizenPlatformConfigSupported} \
                       -DNON_POWER_OF_TWO_TEXTURES \
                       -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
                       -DWAYLAND_EXTENSIONS_SUPPORTED \
@@ -381,7 +378,6 @@ libdali_adaptor_uv_la_CXXFLAGS = \
                       $(LIBCURL_CFLAGS) \
                       $(TPKP_CURL_CFLAGS)
 
-
 libdali_adaptor_uv_la_CFLAGS = $(libdali_adaptor_uv_la_CXXFLAGS)
 
 libdali_adaptor_uv_la_LIBADD = \
@@ -419,27 +415,12 @@ libdali_adaptor_uv_la_LIBADD += $(ELEMENTARY_LIBS) \
 
 else
 
-if MOBILE_PROFILE
-libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
-libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
-
-if WEARABLE_PROFILE
-libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
-libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
-
-if COMMON_PROFILE
-libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
-libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
-
-if IVI_PROFILE
+if !UBUNTU_PROFILE
 libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
 libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
+endif # !UBUNTU_PROFILE
 
-endif
+endif # USE_EFL
 
 if USE_APPFW
 
@@ -447,20 +428,24 @@ libdali_adaptor_uv_la_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \
                                $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \
                                $(CAPI_SYSTEM_INFO_CFLAGS) \
                                $(TTS_CFLAGS) \
-                               $(SENSOR_CFLAGS)
+                               $(CAPI_SYSTEM_SENSOR_CFLAGS)
 
 libdali_adaptor_uv_la_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
                              $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
                              $(CAPI_SYSTEM_INFO_LIBS) \
                              $(TTS_LIBS) \
-                             $(SENSOR_LIBS)
+                             $(CAPI_SYSTEM_SENSOR_LIBS)
 
 endif
 if WAYLAND
 # This is to avoid having to include wayland-egl.h everywhere
 libdali_adaptor_uv_la_CXXFLAGS += -DWL_EGL_PLATFORM
 libdali_adaptor_uv_la_CXXFLAGS += $(WAYLAND_CFLAGS)
+libdali_adaptor_uv_la_CXXFLAGS += $(WAYLAND_EXTENSION_CFLAGS)
+
 libdali_adaptor_uv_la_LIBADD += $(WAYLAND_LIBS)
+libdali_adaptor_uv_la_LIBADD += $(WAYLAND_EXTENSION_LIBS)
+
 else
 libdali_adaptor_uv_la_CXXFLAGS += $(X11_CFLAGS)
 libdali_adaptor_uv_la_LIBADD += $(X11_LIBS)