X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=a05c81ccd477b86baf6de77d9d07751583eb215d;hb=3de19c55686c23d6eae0dd964868995b8bcdd444;hp=e73494dd2c50a30a2137bb4ff6af00a0308b6983;hpb=0a0eafd071f5922e3cce00832c6e7af6c0dc7909;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index e73494d..a05c81c 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -40,6 +40,10 @@ include ../../../adaptors/integration-api/file.list
 adaptor_common_dir = ../../../adaptors/common
 include ../../../adaptors/common/file.list
 
+# ECore Common
+adaptor_ecore_common_dir = ../../../adaptors/ecore/common
+include ../../../adaptors/ecore/common/file.list
+
 # Wayland
 if WAYLAND
 adaptor_wayland_dir = ../../../adaptors/wayland
@@ -83,6 +87,10 @@ include ../../../adaptors/devel-api/file.list
 static_libraries_libunibreak_src_dir = ../../../text/dali/internal/libunibreak
 include ../../../text/dali/internal/libunibreak/file.list
 
+# Package doc
+package_doxy_dir = ../../../doc
+include ../../../doc/file.list
+
 ############# source files #############
 
 # COMMON
@@ -90,6 +98,7 @@ if COMMON_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_default_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_tizen_internal_src_files) \
                              $(static_libraries_libunibreak_src_files)
 
@@ -108,6 +117,7 @@ if UBUNTU_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_default_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_ubuntu_internal_src_files) \
                              $(adaptor_x11_ubuntu_internal_src_files) \
                              $(adaptor_x11_internal_default_profile_src_files) \
@@ -121,6 +131,7 @@ if MOBILE_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_mobile_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_tizen_internal_src_files) \
                              $(static_libraries_libunibreak_src_files)
 
@@ -137,6 +148,7 @@ if WEARABLE_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_mobile_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_tizen_internal_src_files) \
                              $(static_libraries_libunibreak_src_files)
 if WAYLAND
@@ -153,6 +165,7 @@ if TV_PROFILE
 
 adaptor_internal_src_files = $(adaptor_common_internal_src_files) \
                              $(adaptor_common_internal_tv_profile_src_files) \
+                             $(adaptor_ecore_common_internal_src_files) \
                              $(adaptor_tizen_internal_src_files) \
                              $(static_libraries_libunibreak_src_files)
 if WAYLAND
@@ -192,6 +205,11 @@ libdali_adaptor_la_SOURCES = \
                      $(input_event_handler_src_files)
 
 
+if ENABLE_NETWORK_LOGGING
+libdali_adaptor_la_SOURCES += \
+  $(base_adaptor_networking_src_files)
+endif
+
 libdali_adaptor_la_DEPENDENCIES =
 
 # List include directories with more platform-specific (tizen) before portable root:
@@ -213,10 +231,12 @@ libdali_adaptor_la_includes = \
 
 if WAYLAND
 libdali_adaptor_la_includes += \
+                      -I../../../adaptors/ecore/common \
                       -I../../../adaptors/wayland \
                       -I../../../adaptors/integration-api/wayland
 else
 libdali_adaptor_la_includes += \
+                      -I../../../adaptors/ecore/common \
                       -I../../../adaptors/x11 \
                       -I../../../adaptors/integration-api/x11
 endif
@@ -242,7 +262,7 @@ libdali_adaptor_la_CXXFLAGS = \
                       -DFONT_PRELOADED_PATH="\"${fontPreloadedPath}\"" \
                       -DFONT_DOWNLOADED_PATH="\"${fontDownloadedPath}\"" \
                       -DFONT_APPLICATION_PATH="\"${fontApplicationPath}\"" \
-                      -DFONT_CONFIGURATION_FILE_PATH="\"${fontConfigurationFilePath}\"" \
+                      -DFONT_CONFIGURATION_FILE="\"${fontConfigurationFile}\"" \
                       -DNON_POWER_OF_TWO_TEXTURES \
                       -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
                       -Werror -Wall -lgcc \
@@ -260,7 +280,6 @@ libdali_adaptor_la_CXXFLAGS = \
                       $(ECORE_CFLAGS) \
                       $(ECORE_IPC_CFLAGS) \
                       $(DLOG_CFLAGS) \
-                      $(XML_CFLAGS) \
                       $(VCONF_CFLAGS) \
                       $(EXIF_CFLAGS) \
                       $(MMFSOUND_CFLAGS) \
@@ -283,7 +302,6 @@ libdali_adaptor_la_LIBADD = \
                       $(ELEMENTARY_LIBS) \
                       $(ECORE_IPC_LIBS) \
                       $(DLOG_LIBS) \
-                      $(XML_LIBS) \
                       $(VCONF_LIBS) \
                       $(EXIF_LIBS) \
                       $(TTS_LIBS) \
@@ -298,8 +316,6 @@ libdali_adaptor_la_LIBADD = \
                       $(ELDBUS_LIBS) \
                       -lgif \
                       -lpthread \
-                      -lboost_thread \
-                      -lboost_system \
                       -lturbojpeg
 
 if WAYLAND
@@ -386,6 +402,10 @@ install-data-local:
 # Install resource log analyzer script
 bin_SCRIPTS = ../../../adaptors/scripts/dalireslog.sh
 
+# package doxygen file (contains doxygen grouping information)
+packagedoxydir = $(devincludepath)/dali/doc
+packagedoxy_HEADERS = $(package_doxy_files)
+
 # linking test
 
 # turn off the linker test if were building for libuv