[3.0] Add dali-adaptor as shared library

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Ib78fc4f1ec04e690770d17c2c9a601457d96b000

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 21e03da..546b6a5 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -29,6 +29,7 @@ DALI_TOOLKIT_VERSION=dali_version
 AC_SUBST(DALI_TOOLKIT_VERSION)
 
 PKG_CHECK_MODULES(DALICORE, dali-core)
+PKG_CHECK_MODULES(DALIADAPTOR, dali-adaptor)
 
 DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
 

diff --git a/build/tizen/dali-toolkit.pc.in b/build/tizen/dali-toolkit.pc.in
index 87cbcc0..8cf4802 100644 (file)
--- a/build/tizen/dali-toolkit.pc.in
+++ b/build/tizen/dali-toolkit.pc.in
@@ -4,9 +4,9 @@ apiversion=@DALI_TOOLKIT_VERSION@
 libdir=@libdir@
 includedir=@devincludepath@
 
-Name: Samsung OpenGLES Toolkit (including Toolkit)
+Name: dali-toolkit
 Description: 3D Canvas Toolkit using OpenGLES (with the toolkit)
 Version: ${apiversion}
-Requires: dali-core
+Requires: dali-core dali-adaptor
 Libs: -L${libdir} -ldali-toolkit
-Cflags: -I${includedir}
+Cflags: -I${includedir}/dali-toolkit

diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index 766567f..4e2ca40 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -80,12 +80,14 @@ libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
                       -I../../../ \
                       $(DALI_TOOLKIT_CFLAGS) \
                       $(DALICORE_CFLAGS) \
+                      $(DALIADAPTOR_CFLAGS) \
                       $(DLOG_CFLAGS) \
                       $(FRIBIDI_CFLAGS) \
                       $(HTMLCXX_CFLAGS)
 
 libdali_toolkit_la_LIBADD = \
                       $(DALICORE_LIBS) \
+                      $(DALIADAPTOR_LIBS) \
                       $(DLOG_LIBS) \
                       $(FRIBIDI_LIBS) \
                       $(HTMLCXX_LIBS)

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 28fbf2d..9b38301 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -13,6 +13,7 @@ Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dali-core)
+BuildRequires:  pkgconfig(dali-adaptor)
 BuildRequires: gettext
 
 # dali-toolkit only need to know the interfaces(APIs) of dali-adaptor(the devel package).