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
Revert "[Tizen] Implement WebEngineLite interface and plugin for Minimized Web Engine"
[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
48b6b7c
..
278db2c
100644
(file)
--- a/
build/tizen/adaptor/Makefile.am
+++ b/
build/tizen/adaptor/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+# Copyright (c) 201
8
Samsung Electronics Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-70,9
+70,14
@@
LIBDALI_ADAPTOR_LA_SOURCES = \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
+if ENABLE_NETWORK_LOGGING
+LIBDALI_ADAPTOR_LA_SOURCES += \
+ $(adaptor_performance_logging_src_files)
endif
endif
-# $(adaptor_accessibility_tizen_common_src_files)
+endif
+
+
if MOBILE_PROFILE
LIBDALI_ADAPTOR_LA_SOURCES = \
$(adaptor_accessibility_common_src_files) \
if MOBILE_PROFILE
LIBDALI_ADAPTOR_LA_SOURCES = \
$(adaptor_accessibility_common_src_files) \
@@
-111,9
+116,13
@@
LIBDALI_ADAPTOR_LA_SOURCES = \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
+if ENABLE_NETWORK_LOGGING
+LIBDALI_ADAPTOR_LA_SOURCES += \
+ $(adaptor_performance_logging_src_files)
+endif
+
endif
endif
-# $(adaptor_accessibility_tizen_common_src_files)
if IVI_PROFILE
LIBDALI_ADAPTOR_LA_SOURCES = \
if IVI_PROFILE
LIBDALI_ADAPTOR_LA_SOURCES = \
@@
-152,9
+161,14
@@
LIBDALI_ADAPTOR_LA_SOURCES = \
$(devel_api_text_abstraction_src_files) \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
$(devel_api_text_abstraction_src_files) \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
+
+if ENABLE_NETWORK_LOGGING
+LIBDALI_ADAPTOR_LA_SOURCES += \
+ $(adaptor_performance_logging_src_files)
+endif
+
endif
endif
-# $(adaptor_accessibility_tizen_common_src_files)
if TV_PROFILE
LIBDALI_ADAPTOR_LA_SOURCES = \
if TV_PROFILE
LIBDALI_ADAPTOR_LA_SOURCES = \
@@
-192,6
+206,12
@@
LIBDALI_ADAPTOR_LA_SOURCES = \
$(devel_api_text_abstraction_src_files) \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
$(devel_api_text_abstraction_src_files) \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
+
+if ENABLE_NETWORK_LOGGING
+LIBDALI_ADAPTOR_LA_SOURCES += \
+ $(adaptor_performance_logging_src_files)
+endif
+
endif
if COMMON_PROFILE
endif
if COMMON_PROFILE
@@
-230,9
+250,14
@@
LIBDALI_ADAPTOR_LA_SOURCES = \
$(devel_api_text_abstraction_src_files) \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
$(devel_api_text_abstraction_src_files) \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
+
+if ENABLE_NETWORK_LOGGING
+LIBDALI_ADAPTOR_LA_SOURCES += \
+ $(adaptor_performance_logging_src_files)
+endif
+
endif
endif
-# $(adaptor_accessibility_tizen_common_src_files)
if WEARABLE_PROFILE
if WEARABLE_PROFILE
@@
-273,8
+298,15
@@
LIBDALI_ADAPTOR_LA_SOURCES = \
$(devel_api_text_abstraction_src_files) \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
$(devel_api_text_abstraction_src_files) \
$(static_libraries_glyphy_src_files) \
$(static_libraries_libunibreak_src_files)
+
+if ENABLE_NETWORK_LOGGING
+LIBDALI_ADAPTOR_LA_SOURCES += \
+ $(adaptor_performance_logging_src_files)
endif
endif
+endif
+
+
# Package doc
package_doxy_dir = ../../../doc
include ../../../doc/file.list
# Package doc
package_doxy_dir = ../../../doc
include ../../../doc/file.list
@@
-469,6
+501,15
@@
LIBDALI_ADAPTOR_LA_LIBADD += -ljpeg
CFLAGS += -fPIC
endif
CFLAGS += -fPIC
endif
+if !UBUNTU_PROFILE
+if WAYLAND
+else
+# X11
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(UTILX_CFLAGS)
+LIBDALI_ADAPTOR_LA_LIBADD += $(UTILX_LIBS)
+endif
+endif
+
tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
tizenadaptorpublicapi_HEADERS = $(public_api_header_files)
tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
tizenadaptorpublicapi_HEADERS = $(public_api_header_files)