From 33bf9fdd13de13dea3f0d377a3b1ef6af2ab890f Mon Sep 17 00:00:00 2001 From: Denis Khalikov Date: Tue, 6 Jun 2017 20:47:15 +0300 Subject: [PATCH] Test Change-Id: Ib204f83185ec920f5820e5ba45d38f2dbb6b9ee2 --- build/tizen/dali-toolkit/Makefile.am | 54 +++++++++--------------------------- 1 file changed, 13 insertions(+), 41 deletions(-) diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index 23f4669..6193976 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -53,11 +53,7 @@ dalisound_DATA = ${dali_toolkit_sound_files} package_doxy_dir = ../../../doc include ../../../doc/file.list -if ENABLE_CXX03_ABI - -lib_LTLIBRARIES = libdali-toolkit.la - -libdali_toolkit_la_SOURCES = \ +LIBDALI_TOOLKIT_LA_SOURCES = \ $(toolkit_src_files) \ $(public_api_src_files) \ $(devel_api_src_files) \ @@ -71,7 +67,7 @@ dalistyleimages_DATA = ${dali_toolkit_style_images} libdali_toolkit_la_DEPENDENCIES = -libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \ +LIBDALI_TOOLKIT_LA_CXXFLAGS = -DDALI_COMPILATION \ -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \ -DDALI_SOUND_DIR="\"${dalisounddir}\"" \ -DDALI_STYLE_DIR="\"${dalistyledir}\"" \ @@ -85,50 +81,26 @@ libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \ $(FRIBIDI_CFLAGS) \ $(HTMLCXX_CFLAGS) -libdali_toolkit_la_LIBADD = \ +LIBDALI_TOOLKIT_LA_LIBADD = \ $(DALICORE_LIBS) \ $(DLOG_LIBS) \ $(FRIBIDI_LIBS) \ $(HTMLCXX_LIBS) +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) else # The library lib_LTLIBRARIES = libdali-toolkit-cxx11.la - -libdali_toolkit_cxx11_la_SOURCES = \ - $(toolkit_src_files) \ - $(public_api_src_files) \ - $(devel_api_src_files) \ - $(third_party_src_files) - -dalistyledir = ${dataReadOnlyDir}/toolkit/styles/ -dalistyle_DATA = ${dali_toolkit_style_files} - -dalistyleimagesdir = ${dataReadOnlyDir}/toolkit/styles/images/ -dalistyleimages_DATA = ${dali_toolkit_style_images} - -libdali_toolkit_cxx11_la_DEPENDENCIES = - -libdali_toolkit_cxx11_la_CXXFLAGS = -DDALI_COMPILATION \ - -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \ - -DDALI_SOUND_DIR="\"${dalisounddir}\"" \ - -DDALI_STYLE_DIR="\"${dalistyledir}\"" \ - -DDALI_STYLE_IMAGE_DIR="\"${dalistyleimagesdir}\"" \ - -DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \ - -Werror -Wall \ - -I../../../ \ - $(DALI_TOOLKIT_CFLAGS) \ - $(DALICORE_CFLAGS) \ - $(DLOG_CFLAGS) \ - $(FRIBIDI_CFLAGS) \ - $(HTMLCXX_CFLAGS) - -libdali_toolkit_cxx11_la_LIBADD = \ - $(DALICORE_LIBS) \ - $(DLOG_LIBS) \ - $(FRIBIDI_LIBS) \ - $(HTMLCXX_LIBS) +libdali_toolkit_cxx11_la_SOURCES = $(LIBDALI_TOOLKIT_LA_SOURCES) +libdali_toolkit_cxx11_la_LIBADD = $(LIBDALI_TOOLKIT_LA_LIBADD) +libdali_toolkit_cxx11_la_CXXFLAGS = $(LIBDALI_TOOLKIT_LA_CXXFLAGS) +libdali_toolkit_cxx11_la_CFLAGS = $(LIBDALI_TOOLKTI_LA_CFLAGS) endif # Install headers -- 2.7.4