X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=1c114636c59539c31e3fa0637ea59996349ee1db;hb=4626edaf09dd3991141017b38fb2b9ceb8a9c9d6;hp=d62e6ff0fbd48bc564bcd131ca60b1e3822d36ed;hpb=20d198266c9c0428ddab7b80f4239591a33d6068;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index d62e6ff..1c11463 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
@@ -447,7 +460,6 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS = \
                       $(LIBDRM_CFLAGS) \
                       $(LIBEXIF_CFLAGS) \
                       $(LIBCURL_CFLAGS) \
-                      $(LIBCRYPTO_CFLAGS) \
                       $(TPKP_CURL_CFLAGS) \
                       $(UTILX_CFLAGS)
 
@@ -476,8 +488,8 @@ LIBDALI_ADAPTOR_LA_LIBADD = \
                       $(LIBDRM_LIBS) \
                       $(LIBEXIF_LIBS) \
                       $(LIBCURL_LIBS) \
-                      $(LIBCRYPTO_LIBS) \
                       $(HARFBUZZ_LIBS) \
+                      $(AUTOFILL_LIBS) \
                       $(TPKP_CURL_LIBS) \
                       $(UTILX_LIBS) \
                       -lgif \
@@ -647,19 +659,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)
@@ -668,8 +667,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
 
@@ -688,23 +685,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
 
@@ -716,4 +699,3 @@ install: install-am
 	ln -s $(libdir)/libdali-adaptor-cxx11.so.0.0.* $(libdir)/libdali-adaptor.so
 endif
 
-endif