Fix head-use-after-free issue detected by ASAN

[platform/core/uifw/isf.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index acd76e4..e76fa4f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,12 +28,13 @@ EXTRA_DIST          = config.rpath \
                          mkinstalldirs \
                          bootstrap \
                          scim.spec \
+                         isf-control.spec \
                          intltool-extract.in \
                          intltool-merge.in \
                          intltool-update.in
 
 AUTOMAKE_OPTIONS       = gnu
-SUBDIRS                = ism/src ism/utils ism/modules ism/configs po/scim ism/extras ism/data ism/demos
+SUBDIRS                = ism/src ism/utils ism/modules ism/configs po ism/extras ism/data ism/demos ism/tests engine-loader
 
 MAINTAINERCLEANFILES   = Makefile.in \
                          aclocal.m4 \
@@ -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,16 +54,13 @@ 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@
+kbdmodechangerxml_DATA = org.tizen.isf-kbd-mode-changer.xml
 
-if ISF_INSTALL_SYSTEMD_SCRIPT
-SYSTEMD_SCRIPT = scim.service
-endif
-# $(libdir) will be /usr/lib64 on x86_64 arch, so hard-coded.
-systemduserunitdir = /usr/lib/systemd/user
-systemduserunit_DATA = $(SYSTEMD_SCRIPT)
+udevdir = /etc/udev/rules.d/
 
 ACLOCAL_AMFLAGS = -I ism/m4
 
@@ -75,7 +73,3 @@ uninstall-local:
        rm -rf @SCIM_MODULE_PATH@
 
 install-data-hook:
-if ISF_INSTALL_SYSTEMD_SCRIPT
-       $(mkinstalldirs) $(DESTDIR)$(systemduserunitdir)/default.target.wants
-       ln -sf ../scim.service $(DESTDIR)$(systemduserunitdir)/default.target.wants/scim.service
-endif