X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=5a6123e0e872ffd51a8a08dfe28201ef1ee1a318;hb=3259f7e05d09669ec473725ac360652beb6ed0b3;hp=3f699fa1b252f99103f27c3faa234f0402ace403;hpb=5ad3e7144846e5e4cbf1602ef9278d4d13095c3b;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 3f699fa..b549138 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,33 +24,29 @@ 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 LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ - $(adaptor_accessibility_ubuntu_src_files) \ $(adaptor_adaptor_common_src_files) \ $(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) \ + $(bridge_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,46 +54,56 @@ 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) \ + $(adaptor_trace_common_src_files) \ + $(adaptor_thread_common_src_files) \ $(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 += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_ubuntu_src_files) +endif + endif if MOBILE_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_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) \ + $(bridge_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) \ @@ -105,40 +111,57 @@ 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) \ - $(adaptor_window_system_tizen_mobile_src_files) \ $(adaptor_window_system_tizen_src_files) \ $(adaptor_window_system_tizen_wayland_src_files) \ + $(adaptor_trace_common_src_files) \ + $(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 += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) +endif + endif if IVI_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_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) \ + $(bridge_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) \ @@ -146,6 +169,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) \ @@ -153,45 +177,64 @@ 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) \ $(adaptor_window_system_tizen_src_files) \ $(adaptor_window_system_tizen_wayland_src_files) \ + $(adaptor_trace_common_src_files) \ + $(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 += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) +endif + endif if TV_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_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) \ + $(bridge_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) \ @@ -199,44 +242,63 @@ 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) \ $(adaptor_window_system_tizen_src_files) \ $(adaptor_window_system_tizen_wayland_src_files) \ + $(adaptor_trace_common_src_files) \ + $(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 += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) +endif + endif if COMMON_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_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) \ + $(bridge_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) \ @@ -244,23 +306,41 @@ 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) \ $(adaptor_window_system_tizen_src_files) \ $(adaptor_window_system_tizen_wayland_src_files) \ + $(adaptor_trace_common_src_files) \ + $(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 += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) +endif + endif @@ -268,23 +348,24 @@ endif if WEARABLE_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_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) \ + $(bridge_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) \ @@ -292,26 +373,42 @@ 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) \ $(adaptor_window_system_tizen_src_files) \ $(adaptor_window_system_tizen_wayland_src_files) \ - $(adaptor_window_system_tizen_wearable_src_files) \ + $(adaptor_trace_common_src_files) \ + $(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 += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) endif +endif # Package doc package_doxy_dir = ../../../doc @@ -347,6 +444,7 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS = \ $(OPENGLES20_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(FONTCONFIG_CFLAGS) \ + $(CAIRO_CFLAGS) \ $(PNG_CFLAGS) \ $(DLOG_CFLAGS) \ $(VCONF_CFLAGS) \ @@ -376,6 +474,7 @@ LIBDALI_ADAPTOR_LA_LIBADD = \ $(OPENGLES20_LIBS) \ $(FREETYPE_LIBS) \ $(FONTCONFIG_LIBS) \ + $(CAIRO_LIBS) \ $(PNG_LIBS) \ $(DLOG_LIBS) \ $(VCONF_LIBS) \ @@ -387,6 +486,7 @@ LIBDALI_ADAPTOR_LA_LIBADD = \ $(LIBCURL_LIBS) \ $(LIBCRYPTO_LIBS) \ $(HARFBUZZ_LIBS) \ + $(AUTOFILL_LIBS) \ $(TPKP_CURL_LIBS) \ $(UTILX_LIBS) \ -lgif \ @@ -410,34 +510,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) @@ -524,15 +616,6 @@ tizenadaptordevelapidir= $(devincludepath)/dali/devel-api tizenadaptorintegrationapidir = $(devincludepath)/dali/integration-api/adaptors tizenadaptorintegrationapi_HEADERS = $(adaptor_integration_api_header_files) -if WAYLAND -tizenadaptorintegrationwaylandapidir = $(devincludepath)/dali/integration-api/adaptors -tizenadaptorintegrationwaylandapi_HEADERS = $(adaptor_integration_wayland_api_header_files) -tizenadaptorintegrationwaylandapi_HEADERS += $(adaptor_integration_ecore_wayland_api_header_files) -else -tizenadaptorintegrationx11apidir = $(devincludepath)/dali/integration-api/adaptors -tizenadaptorintegrationx11api_HEADERS = $(adaptor_integration_x11_api_header_files) -endif - tizenadaptorframeworkpublicapidir = $(tizenadaptorpublicapidir)/adaptor-framework tizenadaptorframeworkpublicapi_HEADERS = $(public_api_adaptor_framework_header_files) @@ -573,19 +656,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) @@ -594,8 +664,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 @@ -614,23 +682,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 @@ -642,4 +696,3 @@ install: install-am ln -s $(libdir)/libdali-adaptor-cxx11.so.0.0.* $(libdir)/libdali-adaptor.so endif -endif