X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fdali-toolkit%2FMakefile.am;h=5baff32ab9d3b65a8b95651133a6939b2a57bb97;hb=9fd2c4d488f34d3d13b690780a23522c73833aa5;hp=35534a0e7f8c81f84b4a3f7a8c39ff71ad5b8fa6;hpb=eac074bfe3a3c144f55583135515d2c8d16eb479;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index 35534a0..5baff32 100644
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Samsung Electronics Co., Ltd.
+# Copyright (c) 2019 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.
@@ -77,36 +77,20 @@ LIBDALI_TOOLKIT_LA_CXXFLAGS = -DDALI_COMPILATION \
                       -I../../../ \
                       $(DALI_TOOLKIT_CFLAGS) \
                       $(DALICORE_CFLAGS) \
+                      $(DALIADAPTOR_CFLAGS) \
                       $(DLOG_CFLAGS) \
                       $(FRIBIDI_CFLAGS) \
                       $(HTMLCXX_CFLAGS)
 
 LIBDALI_TOOLKIT_LA_LIBADD = \
                       $(DALICORE_LIBS) \
+                      $(DALIADAPTOR_LIBS) \
                       $(DLOG_LIBS) \
                       $(FRIBIDI_LIBS) \
                       $(HTMLCXX_LIBS)
 
 
 # The library
-if ENABLE_CXX03_ABI
-
-lib_LTLIBRARIES = libdali-toolkit.la
-libdali_toolkit_la_SOURCES = $(LIBDALI_TOOLKIT_LA_SOURCES)
-libdali_toolkit_la_LIBADD = $(LIBDALI_TOOLKIT_LA_LIBADD)
-libdali_toolkit_la_CXXFLAGS = $(LIBDALI_TOOLKIT_LA_CXXFLAGS)
-libdali_toolkit_la_CFLAGS = $(LIBDALI_TOOLKTI_LA_CFLAGS)
-
-if ENABLE_RENAME_SO
-#rename
-install: install-am
-	rm -rf $(libdir)/libdali-toolkit.so
-	rm -rf $(libdir)/libdali-toolkit-cxx03.so
-	ln -s $(libdir)/libdali-toolkit.so.0.0.* $(libdir)/libdali-toolkit-cxx03.so
-endif
-
-else
-
 lib_LTLIBRARIES = libdali-toolkit-cxx11.la
 libdali_toolkit_cxx11_la_SOURCES = $(LIBDALI_TOOLKIT_LA_SOURCES)
 libdali_toolkit_cxx11_la_LIBADD = $(LIBDALI_TOOLKIT_LA_LIBADD)
@@ -121,8 +105,6 @@ install: install-am
 	ln -s $(libdir)/libdali-toolkit-cxx11.so.0.0.* $(libdir)/libdali-toolkit.so
 endif
 
-endif
-
 # Install headers
 topleveldir = $(devincludepath)/dali-toolkit
 toplevel_HEADERS = ../../../dali-toolkit/dali-toolkit.h
@@ -140,19 +122,24 @@ develapimagnifierdir =          $(develapicontrolsdir)/magnifier
 develapinavigationviewdir =     $(develapicontrolsdir)/navigation-view
 develapipageturnviewdir =       $(develapicontrolsdir)/page-turn-view
 develapipopupdir =              $(develapicontrolsdir)/popup
+develapiscene3dviewdir =        $(develapicontrolsdir)/scene3d-view
 develapishadowviewdir =         $(develapicontrolsdir)/shadow-view
 develapisuperblurviewdir =      $(develapicontrolsdir)/super-blur-view
+develapiwebviewdir =            $(develapicontrolsdir)/web-view
 develapifocusmanagerdir =       $(develapidir)/focus-manager
 develapiimageloaderdir =        $(develapidir)/image-loader
-develapiscriptingdir =          $(develapidir)/scripting
+develapilayoutingdir =          $(develapidir)/layouting
+develapilayoutingcontrolsdir =  $(develapidir)/controls/layouting
 develapishadereffectsdir =      $(develapidir)/shader-effects
 develapistylingdir =            $(develapidir)/styling
 develapitransitioneffectsdir =  $(develapidir)/transition-effects
 develapitoolbardir =            $(develapicontrolsdir)/tool-bar
 develapitooltipdir =            $(develapicontrolsdir)/tooltip
 develapitextselectionpopupdir = $(develapicontrolsdir)/text-controls
+develapitextdir =               $(develapidir)/text
 develapivisualfactorydir =      $(develapidir)/visual-factory
 develapivisualsdir =            $(develapidir)/visuals
+develapidragdropdir =           $(develapidir)/drag-drop-detector
 
 # devel headers
 develapi_HEADERS =                  $(devel_api_header_files)
@@ -165,21 +152,26 @@ develapieffectsview_HEADERS =       $(devel_api_effects_view_header_files)
 develapifocusmanager_HEADERS =      $(devel_api_focus_manager_header_files)
 develapigaussianblurview_HEADERS =  $(devel_api_gaussian_blur_view_header_files)
 develapiimageloader_HEADERS =       $(devel_api_image_loader_header_files)
+develapilayoutingcontrols_HEADERS = $(devel_api_layouting_controls_header_files)
+develapilayouting_HEADERS =         $(devel_api_layouting_header_files)
 develapimagnifier_HEADERS =         $(devel_api_magnifier_header_files)
 develapinavigationview_HEADERS =    $(devel_api_navigation_view_header_files)
 develapipageturnview_HEADERS =      $(devel_api_page_turn_view_header_files)
 develapipopup_HEADERS =             $(devel_api_popup_header_files)
 develapivisualfactory_HEADERS =     $(devel_api_visual_factory_header_files)
 develapivisuals_HEADERS =           $(devel_api_visuals_header_files)
-develapiscripting_HEADERS =         $(devel_api_scripting_header_files)
+develapiscene3dview_HEADERS =       $(devel_api_scene3d_view_header_files)
 develapishadowview_HEADERS =        $(devel_api_shadow_view_header_files)
 develapishadereffects_HEADERS =     $(devel_api_shader_effects_header_files)
 develapistyling_HEADERS =           $(devel_api_styling_header_files)
 develapisuperblurview_HEADERS =     $(devel_api_super_blur_view_header_files)
+develapiwebview_HEADERS =           $(devel_api_web_view_header_files)
 develapitoolbar_HEADERS =           $(devel_api_tool_bar_header_files)
 develapitooltip_HEADERS =           $(devel_api_tooltip_header_files)
 develapitransitioneffects_HEADERS = $(devel_api_transition_effects_header_files)
 develapitextselectionpopup_HEADERS = $(devel_api_text_controls_header_files)
+develapitext_HEADERS =              $(devel_api_text_header_files)
+develapidragdrop_HEADERS =          $(devel_api_drag_and_drop_detector_header_files)
 
 # public api source
 publicapidir =                     $(topleveldir)/public-api