projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-adaptor.git]
/
build
/
tizen
/
adaptor
/
Makefile.am
diff --git
a/build/tizen/adaptor/Makefile.am
b/build/tizen/adaptor/Makefile.am
index
c06be0d
..
d04baf7
100644
(file)
--- a/
build/tizen/adaptor/Makefile.am
+++ b/
build/tizen/adaptor/Makefile.am
@@
-395,7
+395,6
@@
libdali_adaptor_la_CXXFLAGS = \
$(CAPI_SYSTEM_SENSOR_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(LIBEXIF_CFLAGS) \
$(CAPI_SYSTEM_SENSOR_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(LIBEXIF_CFLAGS) \
- $(SCREENCONNECTORPROVIDER_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(TPKP_CURL_CFLAGS) \
$(UTILX_CFLAGS)
$(LIBCURL_CFLAGS) \
$(TPKP_CURL_CFLAGS) \
$(UTILX_CFLAGS)
@@
-423,7
+422,6
@@
libdali_adaptor_la_LIBADD = \
$(CAPI_SYSTEM_SENSOR_LIBS) \
$(LIBDRM_LIBS) \
$(LIBEXIF_LIBS) \
$(CAPI_SYSTEM_SENSOR_LIBS) \
$(LIBDRM_LIBS) \
$(LIBEXIF_LIBS) \
- $(SCREENCONNECTORPROVIDER_LIBS) \
$(LIBCURL_LIBS) \
$(HARFBUZZ_LIBS) \
$(TPKP_CURL_LIBS) \
$(LIBCURL_LIBS) \
$(HARFBUZZ_LIBS) \
$(TPKP_CURL_LIBS) \
@@
-495,7
+493,7
@@
endif
if WEARABLE_PROFILE
libdali_adaptor_la_CXXFLAGS += \
$(HAPTIC_CFLAGS) \
if WEARABLE_PROFILE
libdali_adaptor_la_CXXFLAGS += \
$(HAPTIC_CFLAGS) \
- $(EFL_ASSIST_CFLAGS)
+ $(EFL_ASSIST_CFLAGS)
\
$(APPCORE_WATCH_CFLAGS)
libdali_adaptor_la_LIBADD += \
$(APPCORE_WATCH_CFLAGS)
libdali_adaptor_la_LIBADD += \