Remove unused dependencies

Change-Id: I23efc141a8a7f743deab0fbf7cf6e3f80626d04c

diff --git a/configure.ac b/configure.ac
index 5f78645..9cd2f38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -272,8 +272,11 @@ fi
 # Check WAYLAND TEXT INPUT library
 PKG_CHECK_MODULES(WL_TEXT_INPUT, [text-client input-method-client])
 
+# Check EDJE library
+PKG_CHECK_MODULES(EDJE, [edje])
+
 # Check ELEMENTARY library
-PKG_CHECK_MODULES(ELEMENTARY, [elementary edje],
+PKG_CHECK_MODULES(ELEMENTARY, [elementary],
                   [ISF_HAS_ELM=yes],
                   [ISF_HAS_ELM=no])
 

diff --git a/ism/extras/efl_panel/Makefile.am b/ism/extras/efl_panel/Makefile.am
index c1178d8..8b307f0 100644 (file)
--- a/ism/extras/efl_panel/Makefile.am
+++ b/ism/extras/efl_panel/Makefile.am
@@ -30,6 +30,7 @@ isf_panel_efl_SOURCES  = isf_panel_efl.cpp \
                          $(top_builddir)/ism/src/isf_pkg.cpp
 
 isf_panel_efl_CXXFLAGS = @ECOREX_CFLAGS@ \
+                         @EDJE_CFLAGS@ \
                          @ELEMENTARY_CFLAGS@ \
                          @VCONF_CFLAGS@ \
                          @X11_CFLAGS@ \
@@ -48,6 +49,7 @@ isf_panel_efl_CXXFLAGS = @ECOREX_CFLAGS@ \
 
 isf_panel_efl_LDFLAGS  = @LTLIBINTL@ -rpath $(libdir) \
                          @ECOREX_LIBS@ \
+                         @EDJE_LIBS@ \
                          @ELEMENTARY_LIBS@ \
                          @VCONF_LIBS@ \
                          @X11_LIBS@ \

diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am
index 4c99bd8..21d012c 100644 (file)
--- a/ism/src/Makefile.am
+++ b/ism/src/Makefile.am
@@ -148,31 +148,23 @@ libscim@SCIM_EPOCH@_la_SOURCES = \
 libscim@SCIM_EPOCH@_la_CXXFLAGS = @EVAS_CFLAGS@ \
                          @DLOG_CFLAGS@ \
                          @CYNARA_CFLAGS@ \
+                         @DB_UTIL_CFLAGS@ \
                          @TZPLATFORM_CONFIG_CFLAGS@
 
 libscim@SCIM_EPOCH@_la_LDFLAGS  = -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \
                          -export-dynamic \
                          -rpath $(libdir) \
                          $(LD_VERSION_SCRIPT_OPTION) \
-                         @DLOG_LIBS@ \
                          @LIBTOOL_EXPORT_OPTIONS@ \
                          @LIBICONV@ \
                          @LTLIBINTL@ \
                          @EVAS_LIBS@ \
+                         @DLOG_LIBS@ \
                          @CYNARA_LIBS@ \
+                         @DB_UTIL_LIBS@ \
                          @TZPLATFORM_CONFIG_LIBS@ \
                          -lstdc++
 
-if ISF_BUILD_DB_UTIL
-libscim@SCIM_EPOCH@_la_CXXFLAGS  += @DB_UTIL_CFLAGS@
-libscim@SCIM_EPOCH@_la_LDFLAGS   += @DB_UTIL_LIBS@
-endif
-
-if HAVE_X
-libscim@SCIM_EPOCH@_la_CXXFLAGS += @ECOREX_CFLAGS@
-libscim@SCIM_EPOCH@_la_LDFLAGS  += @ECOREX_LIBS@
-endif
-
 libscim@SCIM_EPOCH@_la_LIBADD  = libltdlc.la
 
 
@@ -183,11 +175,6 @@ scim_CXXFLAGS              = @ECORE_CFLAGS@ @ECORE_IPC_CFLAGS@ @PRIVILEGE_CONTROL_CFLAGS@ @P
 scim_LDADD             = libscim@SCIM_EPOCH@.la
 scim_LDFLAGS           = @LTLIBINTL@ @ECORE_LIBS@ @ECORE_IPC_LIBS@ @PRIVILEGE_CONTROL_LIBS@ @PKGMGR_INFO_LIBS@ @DLOG_LIBS@ -pie
 
-if HAVE_X
-scim_CXXFLAGS += @ECOREX_CFLAGS@
-scim_LDFLAGS  += @ECOREX_LIBS@
-endif
-
 isf_log_SOURCES                = isf_log.cpp
 isf_log_LDADD          = libscim@SCIM_EPOCH@.la
 if SCIM_BUILD_GTK_UTILS
@@ -210,9 +197,3 @@ scim_helper_launcher_SOURCES        = scim_helper_launcher.cpp ise_preexec.cpp
 scim_helper_launcher_CXXFLAGS  = @PRIVILEGE_CONTROL_CFLAGS@ @ECORE_CFLAGS@ @DLOG_CFLAGS@ @ECORE_IPC_CFLAGS@ -fPIE
 scim_helper_launcher_LDADD     = libscim@SCIM_EPOCH@.la
 scim_helper_launcher_LDFLAGS   = @LTLIBINTL@ @PRIVILEGE_CONTROL_LIBS@ @ECORE_LIBS@ @DLOG_LIBS@ @ECORE_IPC_LIBS@ -pie
-
-if HAVE_X
-scim_helper_launcher_CXXFLAGS += @ECOREX_CFLAGS@
-scim_helper_launcher_LDFLAGS  += @ECOREX_LIBS@
-endif
-