Merge pull request #119 from dai-vdr/void_a_useless_dependency

avoid a useless dependency
uim · Jan 6, 2018 · c8cdf57 · c8cdf57
2 parents 6e8be7b + 421f84e
commit c8cdf57
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/gtk2/immodule/Makefile.am b/gtk2/immodule/Makefile.am
@@ -11,13 +11,14 @@ module_LTLIBRARIES = $(im_uim_la)
 
 
 im_uim_la_SOURCES = $(IM_UIM_SOURCES)
-im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
+im_uim_la_LDFLAGS = -module -avoid-version
 im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
 		   $(top_builddir)/uim/libuim.la \
 		   $(top_builddir)/uim/libuim-counted-init.la
 if LIBUIM_X_UTIL
 im_uim_la_LIBADD += $(top_builddir)/uim/libuim-x-util.la
 endif
+im_uim_la_LIBADD += -lm @GTK2_LIBS@
 
 
 IM_UIM_SOURCES = \

diff --git a/gtk3/immodule/Makefile.am b/gtk3/immodule/Makefile.am
@@ -10,13 +10,15 @@ module_LTLIBRARIES = $(im_uim_la)
 
 
 im_uim_la_SOURCES = $(IM_UIM_SOURCES)
-im_uim_la_LDFLAGS = -module -avoid-version @GTK3_LIBS@
+im_uim_la_LDFLAGS = -module -avoid-version
 im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
 		   $(top_builddir)/uim/libuim.la \
 		   $(top_builddir)/uim/libuim-counted-init.la
 if LIBUIM_X_UTIL
 im_uim_la_LIBADD += $(top_builddir)/uim/libuim-x-util.la
 endif
+im_uim_la_LIBADD += @GTK3_LIBS@
+im_uim_la_LIBADD += -lm
 
 
 IM_UIM_SOURCES = \

diff --git a/uim/Makefile.am b/uim/Makefile.am
@@ -135,7 +135,7 @@ endif
 if EXPAT
 uim_plugin_LTLIBRARIES += libuim-expat.la
 libuim_expat_la_SOURCES = expat.c
-libuim_expat_la_LIBADD = @EXPAT_LIBS@ libuim.la
+libuim_expat_la_LIBADD = @EXPAT_LIBS@ libuim.la libuim-scm.la
 libuim_expat_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
 libuim_expat_la_CPPFLAGS = -I$(top_srcdir) @EXPAT_CFLAGS@
 endif
@@ -213,7 +213,7 @@ libuim_bsdlook_la_CPPFLAGS = -I$(top_srcdir)
 
 uim_plugin_LTLIBRARIES += libuim-lolevel.la
 libuim_lolevel_la_SOURCES = lolevel.c
-libuim_lolevel_la_LIBADD = libuim.la
+libuim_lolevel_la_LIBADD = libuim.la libuim-scm.la
 libuim_lolevel_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
 libuim_lolevel_la_CPPFLAGS = -I$(top_srcdir)