Separate libisfcontrol.so from libscim.so

Change-Id: I1aeff48ede28181809a425f1404c6a10c3a4a18f

diff --git a/Makefile.am b/Makefile.am
index d96bc136927ce62f2d6bebae93651e07cb19245d..f8d9e02295e1b03ae9ed5d9baed8337a543dc587 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,7 @@ EXTRA_DIST            = config.rpath \
                          mkinstalldirs \
                          bootstrap \
                          scim.spec \
+                         isf-control.spec \
                          intltool-extract.in \
                          intltool-merge.in \
                          intltool-update.in
@@ -41,7 +42,7 @@ MAINTAINERCLEANFILES  = Makefile.in \
                          config.h.in \
                          $(AUX_DIST)
 
-DISTCLEANFILES         = isf.pc scim.pc scim-gtkutils.pc intltool-extract intltool-merge intltool-update
+DISTCLEANFILES         = isf.pc scim.pc isf-control.pc scim-gtkutils.pc intltool-extract intltool-merge intltool-update
 
 CLEANFILES             = *.bak
 
@@ -53,7 +54,7 @@ if SCIM_BUILD_GTK_UTILS
 GTK_UTILS_PKGCONFIG     = scim-gtkutils.pc
 endif
 
-pkgconfig_DATA          = isf.pc scim.pc \
+pkgconfig_DATA          = isf.pc scim.pc isf-control.pc \
                          $(GTK_UTILS_PKGCONFIG)
 
 kbdmodechangerxmldir = @RO_PACKAGES_DIR@

diff --git a/configure.ac b/configure.ac
index 2ea87faa22ddf198b877194c8a82ee53746a424d..ab7ab25a7a17c87a96e968bf6e11a24d92f5e5f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,11 @@ AC_SUBST(SCIM_EPOCH)
 SCIM_BINARY_VERSION=1.4.0
 AC_SUBST(SCIM_BINARY_VERSION)
 
+# Define a string for the name of ISF-CONTROL library.
+#
+ISF_CONTROL=isf-control
+AC_SUBST(ISF_CONTROL)
+
 AC_DEFINE_UNQUOTED(SCIM_BINARY_VERSION, "$SCIM_BINARY_VERSION", [The binary version of SCIM library.])
 AC_DEFINE_UNQUOTED(SCIM_VERSION, "$SCIM_VERSION", [The release version of SCIM library.])
 AC_DEFINE_UNQUOTED(SCIM_MAJOR_VERSION, $SCIM_MAJOR_VERSION, [The Major version of SCIM library.])
@@ -912,7 +917,9 @@ AC_CONFIG_FILES([Makefile
                  isf.pc
                  scim.pc
                  scim-gtkutils.pc
-                 scim.spec])
+                 scim.spec
+                 isf-control.pc
+                 isf-control.spec])
 AC_OUTPUT
 
 AC_MSG_RESULT([

diff --git a/isf-control.pc.in b/isf-control.pc.in
new file mode 100644 (file)
index 0000000..3bf0338
--- /dev/null
+++ b/isf-control.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+sysconfdir=@sysconfdir@
+moduledir=@libdir@/@ISF_CONTROL@
+
+Name: isf-control
+Description: Tizen platform ISF control library
+Version: 0.0.1
+Requires:
+Libs: -L${libdir} -l@ISF_CONTROL@
+Cflags: -I${includedir}/@ISF_CONTROL@

diff --git a/isf-control.spec.in b/isf-control.spec.in
new file mode 100644 (file)
index 0000000..bc645ad
--- /dev/null
+++ b/isf-control.spec.in
@@ -0,0 +1,77 @@
+%define nam             isf-control
+%define ver             0.0.1
+%define rel             1
+
+# Something's not quite right with libtool....
+%define __libtoolize    echo
+
+Summary:        Tizen platform ISF control library
+Name:           %{nam}
+Version:        %{ver}
+Release:        %{rel}
+License:        LGPL
+Group:          System Environment/Libraries
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+Source0:        %{name}-%{version}.tar.gz
+#NoSource: 0
+
+PreReq:         /sbin/ldconfig, /bin/sh
+
+BuildRequires:  pkgconfig >= 0.12
+
+%description
+ISF-CONTROL provides the functions of isf_control API.
+
+%package devel
+Summary:        Tizen platform ISF control library
+Group:          Development/Libraries
+Requires:       %{name} = %{version}
+Requires:       pkgconfig >= 0.12
+
+%description devel
+The isf-control-devel package includes the static libraries and header files
+for the isf-control package.
+
+#--------------------------------------------------
+
+%prep
+
+%setup -n %{name}-%{version}
+
+%build
+CFLAGS="-O3" CXXFLAGS="-O3" \
+%configure \
+
+make
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=${RPM_BUILD_ROOT} install
+
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/isf-control/*/*/*.{a,la}
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+
+%files
+%defattr(-, root, root)
+%dir %{_sysconfdir}/isf-control
+%{_bindir}/isf-control
+%{_libdir}/isf-control.so.*
+
+%files devel
+%defattr(-, root, root)
+%{_libdir}/libisf-control.so
+%{_libdir}/lib*.a
+%{_libdir}/lib*.la
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/isf-control

diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am
index c1d7afd5b630c85cf04c811c196cb691443e9d37..328e715b0a3e6714a793f4a5fa8aca6ce5e11d36 100644 (file)
--- a/ism/src/Makefile.am
+++ b/ism/src/Makefile.am
@@ -16,7 +16,7 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 MAINTAINERCLEANFILES   = Makefile.in scim_types.h
-CLEANFILES             = libltdlc.la libscim.la *.bak
+CLEANFILES             = libltdlc.la libscim.la lib@ISF_CONTROL@.la *.bak
 DISTCLEANFILES         = scim_types.h
 EXTRA_DIST             = libscim.version-script
 
@@ -124,7 +124,7 @@ if SCIM_LD_VERSION_SCRIPT
 LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/libscim.version-script"
 endif
 
-lib_LTLIBRARIES        = libscim@SCIM_EPOCH@.la
+lib_LTLIBRARIES        = libscim@SCIM_EPOCH@.la lib@ISF_CONTROL@.la
 
 libscim@SCIM_EPOCH@_la_SOURCES = \
                          scim_debug.cpp \
@@ -209,3 +209,57 @@ scim_helper_launcher_SOURCES       = scim_helper_launcher.cpp
 scim_helper_launcher_CXXFLAGS  = -fPIE
 scim_helper_launcher_LDADD     = libscim@SCIM_EPOCH@.la
 scim_helper_launcher_LDFLAGS   = @LTLIBINTL@ -pie
+
+lib@ISF_CONTROL@includedir = $(includedir)/@ISF_CONTROL@
+
+lib@ISF_CONTROL@include_HEADERS = scim.h \
+              scim_attribute.h \
+              scim_bind.h \
+              scim_connection.h \
+              scim_debug.h \
+              scim_exception.h \
+              scim_global_config.h \
+              scim_object.h \
+              scim_pointer.h \
+              scim_property.h \
+              scim_signals.h \
+              scim_slot.h \
+              scim_socket.h \
+              scim_trans_commands.h \
+              scim_transaction.h \
+              scim_types.h \
+              scim_utility.h \
+              scim_visibility.h \
+              isf_control.h \
+              isf_imcontrol_client.h \
+              tizen_profile.h
+
+lib@ISF_CONTROL@_la_SOURCES = \
+              scim_chartraits.cpp \
+              scim_connection.cpp \
+              scim_debug.cpp \
+              scim_global_config.cpp \
+              scim_object.cpp \
+              scim_signals.cpp \
+              scim_slot.cpp \
+              scim_socket.cpp \
+              scim_transaction.cpp \
+              scim_utility.cpp \
+              isf_control.cpp \
+              isf_imcontrol_client.cpp
+
+lib@ISF_CONTROL@_la_CXXFLAGS = @EINA_CFLAGS@ \
+                          @DLOG_CFLAGS@ \
+                          @TZPLATFORM_CONFIG_CFLAGS@ \
+                          @VCONF_CFLAGS@
+
+lib@ISF_CONTROL@_la_LDFLAGS  = -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \
+                          -export-dynamic \
+                          -rpath $(libdir) \
+                          @EINA_LIBS@ \
+                          @DLOG_LIBS@ \
+                          @TZPLATFORM_CONFIG_LIBS@ \
+                          @VCONF_LIBS@ \
+                          -lstdc++
+
+lib@ISF_CONTROL@_la_LIBADD   = libltdlc.la libprofile.la

diff --git a/packaging/isf.spec b/packaging/isf.spec
index af40d09a10457335a0d7baa0de3cf54fa3b485d1..5e38292f947d4e4e22e2e81652feb62bcd4317f8 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -144,6 +144,7 @@ ln -sf "module.so" %{_libdir}/ecore_imf/modules/wayland/v-1.20/libwltextinputmod
 %{_libdir}/scim-1.0/1.4.0/FrontEnd/*.so
 %{_libdir}/scim-1.0/scim-helper-launcher
 %{_libdir}/libscim-*.so.*
+%{_libdir}/libisf-control.so.*
 %{TZ_SYS_RO_ETC}/package-manager/parserlib/category/libimeparser.so
 %license COPYING
 %{TZ_SYS_ETC}/dump.d/module.d/*
@@ -153,8 +154,11 @@ ln -sf "module.so" %{_libdir}/ecore_imf/modules/wayland/v-1.20/libwltextinputmod
 %defattr(-,root,root,-)
 %{_includedir}/scim-1.0/*
 %{_libdir}/libscim-*.so
+%{_includedir}/isf-control/*
+%{_libdir}/libisf-control.so
 %{_libdir}/pkgconfig/isf.pc
 %{_libdir}/pkgconfig/scim.pc
+%{_libdir}/pkgconfig/isf-control.pc
 
 %post -n org.tizen.isf-kbd-mode-changer
 mkdir -p %{TZ_SYS_RO_APP}/org.tizen.isf-kbd-mode-changer