X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=aec1ab8b4602f6cd0b4eddd2ad2e20ecca1e750d;hb=4db20b3ce0f7cc820740eb00faace1037682555a;hp=29961793ba8ebd85d1f04bf3bd8b528ae6c5963c;hpb=6b0eb61500ee97af7a2b0b9403e0bbf2786a4b4c;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 2996179..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,6 +35,7 @@ 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) \ @@ -49,6 +46,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_imaging_ubuntu_x11_src_files) \ $(adaptor_input_common_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) \ @@ -70,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 += \ @@ -94,6 +93,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(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) \ @@ -104,6 +104,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) \ @@ -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 += \ @@ -157,6 +159,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(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) \ @@ -168,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) \ @@ -189,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 += \ @@ -221,6 +226,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(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) \ @@ -231,6 +237,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) \ @@ -252,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 += \ @@ -283,6 +291,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(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) \ @@ -293,6 +302,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) \ @@ -314,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 += \ @@ -348,6 +359,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(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) \ @@ -358,6 +370,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) \ @@ -379,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 += \ @@ -401,7 +415,6 @@ endif endif - # Package doc package_doxy_dir = ../../../doc include ../../../doc/file.list @@ -436,6 +449,7 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS = \ $(OPENGLES20_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(FONTCONFIG_CFLAGS) \ + $(CAIRO_CFLAGS) \ $(PNG_CFLAGS) \ $(DLOG_CFLAGS) \ $(VCONF_CFLAGS) \ @@ -465,6 +479,7 @@ LIBDALI_ADAPTOR_LA_LIBADD = \ $(OPENGLES20_LIBS) \ $(FREETYPE_LIBS) \ $(FONTCONFIG_LIBS) \ + $(CAIRO_LIBS) \ $(PNG_LIBS) \ $(DLOG_LIBS) \ $(VCONF_LIBS) \ @@ -476,6 +491,7 @@ LIBDALI_ADAPTOR_LA_LIBADD = \ $(LIBCURL_LIBS) \ $(LIBCRYPTO_LIBS) \ $(HARFBUZZ_LIBS) \ + $(AUTOFILL_LIBS) \ $(TPKP_CURL_LIBS) \ $(UTILX_LIBS) \ -lgif \ @@ -499,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) @@ -596,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) @@ -644,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) @@ -665,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 @@ -685,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 @@ -713,4 +701,3 @@ install: install-am ln -s $(libdir)/libdali-adaptor-cxx11.so.0.0.* $(libdir)/libdali-adaptor.so endif -endif