X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=aec1ab8b4602f6cd0b4eddd2ad2e20ecca1e750d;hb=15cb030e9396d29dab2de0bd298c1daf810bcf5f;hp=5a6123e0e872ffd51a8a08dfe28201ef1ee1a318;hpb=c515b14cdbaa95d243e4f7550c02dc02e985aeac;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 5a6123e..aec1ab8 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 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. @@ -24,11 +24,7 @@ include ./module.list pkgconfigdir = $(libdir)/pkgconfig -if ENABLE_CXX03_ABI -pkgconfig_DATA = dali-adaptor-cxx03.pc dali-adaptor-integration-cxx03.pc -else pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc -endif # sources if UBUNTU_PROFILE @@ -39,18 +35,18 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_adaptor_ubuntu_src_files) \ $(adaptor_clipboard_common_src_files) \ $(adaptor_clipboard_ubuntu_x11_src_files) \ + $(adaptor_framework_generic_src_files) \ $(devel_api_src_files) \ $(adaptor_devel_api_text_abstraction_src_files) \ $(adaptor_graphics_common_src_files) \ - $(adaptor_graphics_gles20_src_files) \ - $(adaptor_graphics_ubuntu_gl_src_files) \ + $(adaptor_graphics_gles_src_files) \ $(adaptor_graphics_ubuntu_src_files) \ $(adaptor_haptics_common_src_files) \ $(adaptor_imaging_common_src_files) \ $(adaptor_imaging_ubuntu_x11_src_files) \ $(adaptor_input_common_src_files) \ - $(adaptor_input_ubuntu_src_files) \ $(adaptor_input_ubuntu_x11_src_files) \ + $(adaptor_integration_api_src_files) \ $(adaptor_legacy_common_src_files) \ $(adaptor_network_common_src_files) \ $(adaptor_public_api_src_files) \ @@ -58,11 +54,12 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_sensor_ubuntu_src_files) \ $(adaptor_styling_common_src_files) \ $(adaptor_system_common_src_files) \ - $(adaptor_system_ubuntu_src_files) \ + $(adaptor_system_linux_src_files) \ $(adaptor_system_ubuntu_x11_src_files) \ $(adaptor_text_common_src_files) \ $(adaptor_text_ubuntu_src_files) \ $(adaptor_resampler_src_files) \ + $(adaptor_vector_animation_common_src_files) \ $(adaptor_video_common_src_files) \ $(adaptor_web_engine_common_src_files) \ $(adaptor_window_system_common_src_files) \ @@ -71,7 +68,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_window_system_ubuntu_x11_src_files) \ $(devel_api_text_abstraction_src_files) \ $(static_libraries_glyphy_src_files) \ - $(static_libraries_libunibreak_src_files) + $(static_libraries_libunibreak_src_files) \ + $(adaptor_dali_src_file) if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ @@ -89,23 +87,24 @@ endif if MOBILE_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ - $(adaptor_accessibility_tizen_src_files) \ + $(adaptor_accessibility_tizen_wayland_src_files) \ $(adaptor_accessibility_tizen_mobile_src_files) \ $(adaptor_adaptor_common_src_files) \ - $(adaptor_adaptor_tizen_src_files) \ $(adaptor_adaptor_tizen_wayland_src_files) \ $(adaptor_clipboard_common_src_files) \ $(adaptor_clipboard_tizen_wayland_src_files) \ + $(adaptor_framework_generic_src_files) \ $(devel_api_src_files) \ $(adaptor_devel_api_text_abstraction_src_files) \ $(adaptor_graphics_common_src_files) \ - $(adaptor_graphics_gles20_src_files) \ + $(adaptor_graphics_gles_src_files) \ $(adaptor_graphics_tizen_src_files) \ $(adaptor_haptics_common_src_files) \ $(adaptor_imaging_common_src_files) \ $(adaptor_imaging_tizen_src_files) \ $(adaptor_input_common_src_files) \ $(adaptor_input_tizen_wayland_src_files) \ + $(adaptor_integration_api_src_files) \ $(adaptor_legacy_common_src_files) \ $(adaptor_network_common_src_files) \ $(adaptor_public_api_src_files) \ @@ -113,9 +112,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_sensor_tizen_src_files) \ $(adaptor_styling_common_src_files) \ $(adaptor_system_common_src_files) \ - $(adaptor_system_tizen_mobile_src_files) \ + $(adaptor_system_linux_src_files) \ + $(adaptor_system_tizen_wayland_src_files) \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_src_files) \ + $(adaptor_vector_animation_common_src_files) \ $(adaptor_video_common_src_files) \ $(adaptor_web_engine_common_src_files) \ $(adaptor_window_system_common_src_files) \ @@ -125,7 +126,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_thread_common_src_files) \ $(devel_api_text_abstraction_src_files) \ $(static_libraries_glyphy_src_files) \ - $(static_libraries_libunibreak_src_files) + $(static_libraries_libunibreak_src_files) \ + $(adaptor_dali_src_file) if ECORE_WAYLAND2 LIBDALI_ADAPTOR_LA_SOURCES += \ @@ -151,17 +153,17 @@ endif if IVI_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ - $(adaptor_accessibility_tizen_src_files) \ + $(adaptor_accessibility_tizen_wayland_src_files) \ $(adaptor_accessibility_tizen_ivi_src_files) \ $(adaptor_adaptor_common_src_files) \ - $(adaptor_adaptor_tizen_src_files) \ $(adaptor_adaptor_tizen_wayland_src_files) \ $(adaptor_clipboard_common_src_files) \ $(adaptor_clipboard_tizen_wayland_src_files) \ + $(adaptor_framework_generic_src_files) \ $(devel_api_src_files) \ $(adaptor_devel_api_text_abstraction_src_files) \ $(adaptor_graphics_common_src_files) \ - $(adaptor_graphics_gles20_src_files) \ + $(adaptor_graphics_gles_src_files) \ $(adaptor_graphics_tizen_src_files) \ $(adaptor_haptics_common_src_files) \ $(adaptor_haptics_tizen_src_files) \ @@ -169,6 +171,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_imaging_tizen_src_files) \ $(adaptor_input_common_src_files) \ $(adaptor_input_tizen_wayland_src_files) \ + $(adaptor_integration_api_src_files) \ $(adaptor_legacy_common_src_files) \ $(adaptor_network_common_src_files) \ $(adaptor_public_api_src_files) \ @@ -176,9 +179,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_sensor_tizen_src_files) \ $(adaptor_styling_common_src_files) \ $(adaptor_system_common_src_files) \ - $(adaptor_system_tizen_ivi_src_files) \ + $(adaptor_system_linux_src_files) \ + $(adaptor_system_tizen_wayland_src_files) \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_src_files) \ + $(adaptor_vector_animation_common_src_files) \ $(adaptor_video_common_src_files) \ $(adaptor_web_engine_common_src_files) \ $(adaptor_window_system_common_src_files) \ @@ -188,7 +193,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_thread_common_src_files) \ $(devel_api_text_abstraction_src_files) \ $(static_libraries_glyphy_src_files) \ - $(static_libraries_libunibreak_src_files) + $(static_libraries_libunibreak_src_files) \ + $(adaptor_dali_src_file) if ECORE_WAYLAND2 LIBDALI_ADAPTOR_LA_SOURCES += \ @@ -214,23 +220,24 @@ endif if TV_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ - $(adaptor_accessibility_tizen_src_files) \ + $(adaptor_accessibility_tizen_wayland_src_files) \ $(adaptor_accessibility_tizen_tv_src_files) \ $(adaptor_adaptor_common_src_files) \ - $(adaptor_adaptor_tizen_src_files) \ $(adaptor_adaptor_tizen_wayland_src_files) \ $(adaptor_clipboard_common_src_files) \ $(adaptor_clipboard_tizen_wayland_src_files) \ + $(adaptor_framework_generic_src_files) \ $(devel_api_src_files) \ $(adaptor_devel_api_text_abstraction_src_files) \ $(adaptor_graphics_common_src_files) \ - $(adaptor_graphics_gles20_src_files) \ + $(adaptor_graphics_gles_src_files) \ $(adaptor_graphics_tizen_src_files) \ $(adaptor_haptics_common_src_files) \ $(adaptor_imaging_common_src_files) \ $(adaptor_imaging_tizen_src_files) \ $(adaptor_input_common_src_files) \ $(adaptor_input_tizen_wayland_src_files) \ + $(adaptor_integration_api_src_files) \ $(adaptor_legacy_common_src_files) \ $(adaptor_network_common_src_files) \ $(adaptor_public_api_src_files) \ @@ -238,9 +245,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_sensor_tizen_src_files) \ $(adaptor_styling_common_src_files) \ $(adaptor_system_common_src_files) \ - $(adaptor_system_tizen_tv_src_files) \ + $(adaptor_system_linux_src_files) \ + $(adaptor_system_tizen_wayland_src_files) \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_src_files) \ + $(adaptor_vector_animation_common_src_files) \ $(adaptor_video_common_src_files) \ $(adaptor_web_engine_common_src_files) \ $(adaptor_window_system_common_src_files) \ @@ -250,7 +259,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_thread_common_src_files) \ $(devel_api_text_abstraction_src_files) \ $(static_libraries_glyphy_src_files) \ - $(static_libraries_libunibreak_src_files) + $(static_libraries_libunibreak_src_files) \ + $(adaptor_dali_src_file) if ECORE_WAYLAND2 LIBDALI_ADAPTOR_LA_SOURCES += \ @@ -275,23 +285,24 @@ endif if COMMON_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ - $(adaptor_accessibility_tizen_src_files) \ + $(adaptor_accessibility_tizen_wayland_src_files) \ $(adaptor_accessibility_tizen_common_src_files) \ $(adaptor_adaptor_common_src_files) \ - $(adaptor_adaptor_tizen_src_files) \ $(adaptor_adaptor_tizen_wayland_src_files) \ $(adaptor_clipboard_common_src_files) \ $(adaptor_clipboard_tizen_wayland_src_files) \ + $(adaptor_framework_generic_src_files) \ $(devel_api_src_files) \ $(adaptor_devel_api_text_abstraction_src_files) \ $(adaptor_graphics_common_src_files) \ - $(adaptor_graphics_gles20_src_files) \ + $(adaptor_graphics_gles_src_files) \ $(adaptor_graphics_tizen_src_files) \ $(adaptor_haptics_common_src_files) \ $(adaptor_imaging_common_src_files) \ $(adaptor_imaging_tizen_src_files) \ $(adaptor_input_common_src_files) \ $(adaptor_input_tizen_wayland_src_files) \ + $(adaptor_integration_api_src_files) \ $(adaptor_legacy_common_src_files) \ $(adaptor_network_common_src_files) \ $(adaptor_public_api_src_files) \ @@ -299,9 +310,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_sensor_tizen_src_files) \ $(adaptor_styling_common_src_files) \ $(adaptor_system_common_src_files) \ - $(adaptor_system_generic_src_files) \ + $(adaptor_system_linux_src_files) \ + $(adaptor_system_tizen_wayland_src_files) \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_src_files) \ + $(adaptor_vector_animation_common_src_files) \ $(adaptor_video_common_src_files) \ $(adaptor_web_engine_common_src_files) \ $(adaptor_window_system_common_src_files) \ @@ -311,7 +324,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_thread_common_src_files) \ $(devel_api_text_abstraction_src_files) \ $(static_libraries_glyphy_src_files) \ - $(static_libraries_libunibreak_src_files) + $(static_libraries_libunibreak_src_files) \ + $(adaptor_dali_src_file) if ECORE_WAYLAND2 LIBDALI_ADAPTOR_LA_SOURCES += \ @@ -338,24 +352,25 @@ endif if WEARABLE_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ - $(adaptor_accessibility_tizen_src_files) \ + $(adaptor_accessibility_tizen_wayland_src_files) \ $(adaptor_accessibility_tizen_wearable_src_files) \ $(adaptor_adaptor_common_src_files) \ - $(adaptor_adaptor_tizen_src_files) \ $(adaptor_adaptor_tizen_wayland_src_files) \ $(adaptor_adaptor_tizen_wearable_src_files) \ $(adaptor_clipboard_common_src_files) \ $(adaptor_clipboard_tizen_wayland_src_files) \ + $(adaptor_framework_generic_src_files) \ $(devel_api_src_files) \ $(adaptor_devel_api_text_abstraction_src_files) \ $(adaptor_graphics_common_src_files) \ - $(adaptor_graphics_gles20_src_files) \ + $(adaptor_graphics_gles_src_files) \ $(adaptor_graphics_tizen_src_files) \ $(adaptor_haptics_common_src_files) \ $(adaptor_imaging_common_src_files) \ $(adaptor_imaging_tizen_src_files) \ $(adaptor_input_common_src_files) \ $(adaptor_input_tizen_wayland_src_files) \ + $(adaptor_integration_api_src_files) \ $(adaptor_legacy_common_src_files) \ $(adaptor_network_common_src_files) \ $(adaptor_public_api_src_files) \ @@ -363,9 +378,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_sensor_tizen_src_files) \ $(adaptor_styling_common_src_files) \ $(adaptor_system_common_src_files) \ + $(adaptor_system_linux_src_files) \ $(adaptor_system_tizen_wearable_src_files) \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_src_files) \ + $(adaptor_vector_animation_common_src_files) \ $(adaptor_video_common_src_files) \ $(adaptor_web_engine_common_src_files) \ $(adaptor_window_system_common_src_files) \ @@ -375,7 +392,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_thread_common_src_files) \ $(devel_api_text_abstraction_src_files) \ $(static_libraries_glyphy_src_files) \ - $(static_libraries_libunibreak_src_files) + $(static_libraries_libunibreak_src_files) \ + $(adaptor_dali_src_file) if ECORE_WAYLAND2 LIBDALI_ADAPTOR_LA_SOURCES += \ @@ -397,7 +415,6 @@ endif endif - # Package doc package_doxy_dir = ../../../doc include ../../../doc/file.list @@ -432,6 +449,7 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS = \ $(OPENGLES20_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(FONTCONFIG_CFLAGS) \ + $(CAIRO_CFLAGS) \ $(PNG_CFLAGS) \ $(DLOG_CFLAGS) \ $(VCONF_CFLAGS) \ @@ -461,6 +479,7 @@ LIBDALI_ADAPTOR_LA_LIBADD = \ $(OPENGLES20_LIBS) \ $(FREETYPE_LIBS) \ $(FONTCONFIG_LIBS) \ + $(CAIRO_LIBS) \ $(PNG_LIBS) \ $(DLOG_LIBS) \ $(VCONF_LIBS) \ @@ -472,6 +491,7 @@ LIBDALI_ADAPTOR_LA_LIBADD = \ $(LIBCURL_LIBS) \ $(LIBCRYPTO_LIBS) \ $(HARFBUZZ_LIBS) \ + $(AUTOFILL_LIBS) \ $(TPKP_CURL_LIBS) \ $(UTILX_LIBS) \ -lgif \ @@ -495,34 +515,26 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \ $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \ $(CAPI_SYSTEM_INFO_CFLAGS) \ $(TTS_CFLAGS) \ - $(SENSOR_CFLAGS) - -LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \ - $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \ - $(CAPI_SYSTEM_INFO_LIBS) \ - $(TTS_LIBS) \ - $(SENSOR_LIBS) -if USE_APPFW_EFL_BASE -LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS) - -LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS) - -else -LIBDALI_ADAPTOR_LA_CXXFLAGS += $(BUNDLE_CFLAGS) \ + $(SENSOR_CFLAGS) \ + $(BUNDLE_CFLAGS) \ $(CAPI_APPFW_COMMON_CFLAGS) \ $(CAPI_APPFW_CONTROL_CFLAGS) \ $(CAPI_APPFW_WIDGET_BASE_CFLAGS) \ $(ECORE_IMF_CFLAGS) \ - $(FRIBIDI_CFLAGS) \ - -DWIDGET_SUPPOERTED + $(FRIBIDI_CFLAGS) -LIBDALI_ADAPTOR_LA_LIBADD += $(BUNDLE_LIBS) \ +LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \ + $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \ + $(CAPI_SYSTEM_INFO_LIBS) \ + $(TTS_LIBS) \ + $(SENSOR_LIBS) \ + $(BUNDLE_LIBS) \ $(CAPI_APPFW_COMMON_LIBS) \ $(CAPI_APPFW_CONTROL_LIBS) \ $(CAPI_APPFW_WIDGET_BASE_LIBS) \ $(ECORE_IMF_LIBS) \ $(FRIBIDI_LIBS) -endif + else LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS) @@ -592,6 +604,15 @@ LIBDALI_ADAPTOR_LA_LIBADD += -ljpeg 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) @@ -640,19 +661,6 @@ packagedoxydir = $(devincludepath)/dali/doc packagedoxy_HEADERS = $(package_doxy_files) - -if ENABLE_CXX03_ABI - -lib_LTLIBRARIES = libdali-adaptor.la - -libdali_adaptor_la_SOURCES = $(LIBDALI_ADAPTOR_LA_SOURCES) -libdali_adaptor_la_includes = $(LIBDALI_ADAPTOR_LA_INCLUDES) -libdali_adaptor_la_CFLAGS = $(LIBDALI_ADAPTOR_LA_CFLAGS) -libdali_adaptor_la_CXXFLAGS = $(LIBDALI_ADAPTOR_LA_CXXFLAGS) -libdali_adaptor_la_LIBADD = $(LIBDALI_ADAPTOR_LA_LIBADD) - -else - lib_LTLIBRARIES = libdali-adaptor-cxx11.la libdali_adaptor_cxx11_la_SOURCES = $(LIBDALI_ADAPTOR_LA_SOURCES) @@ -661,8 +669,6 @@ libdali_adaptor_cxx11_la_CFLAGS = $(LIBDALI_ADAPTOR_LA_CFLAGS) libdali_adaptor_cxx11_la_CXXFLAGS = $(LIBDALI_ADAPTOR_LA_CXXFLAGS) libdali_adaptor_cxx11_la_LIBADD = $(LIBDALI_ADAPTOR_LA_LIBADD) -endif - # linking test noinst_PROGRAMS = linker.test @@ -681,23 +687,9 @@ linker_test_LDADD = \ $(DALICORE_LIBS) \ $(VCONF_LIBS) \ $(HARFBUZZ_LIBS) \ + $(AUTOFILL_LIBS) \ -L${prefix}/lib -if ENABLE_CXX03_ABI - -linker_test_LDADD += libdali-adaptor.la -linker_test_DEPENDENCIES = libdali-adaptor.la - -if ENABLE_RENAME_SO -#rename -install: install-am - rm -rf $(libdir)/libdali-adaptor.so - rm -rf $(libdir)/libdali-adaptor-cxx03.so - ln -s $(libdir)/libdali-adaptor.so.0.0.* $(libdir)/libdali-adaptor-cxx03.so -endif - -else - linker_test_LDADD += libdali-adaptor-cxx11.la linker_test_DEPENDENCIES = libdali-adaptor-cxx11.la @@ -709,4 +701,3 @@ install: install-am ln -s $(libdir)/libdali-adaptor-cxx11.so.0.0.* $(libdir)/libdali-adaptor.so endif -endif