Author: yamakenz
Date: Fri Aug 24 09:28:43 2007
New Revision: 4885
Modified:
trunk/doc/COMPATIBILITY
trunk/emacs/Makefile.am
trunk/examples/uim-custom/Makefile.am
trunk/fep/Makefile.am
trunk/gtk/Makefile.am
trunk/helper/Makefile.am
trunk/qt/Makefile.am
trunk/uim.pc.in
trunk/uim/Makefile.am
trunk/uim/libtool-version.mk
trunk/xim/Makefile.am
Log:
* This commit separate libuim-scm from libuim
* uim/libtool-version.mk
- (libuim_scm_version): New variable initialized with 0:0:0
* uim/Makefile.am
- (lib_LTLIBRARIES): Add libuim-scm.la
- (libuim_la_SOURCES): Remove uim-scm.c
- (libuim_m17nlib_la_LIBADD, libuim_scim_la_LIBADD,
libuim_canna_la_LIBADD, libuim_anthy_la_LIBADD,
libuim_anthy_utf8_la_LIBADD, libuim_mana_la_LIBADD,
libuim_prime_la_LIBADD, libuim_skk_la_LIBADD,
libuim_look_la_LIBADD, libuim_custom_la_LIBADD,
libuim_custom_enabler_la_LIBADD, uim_sh_LDADD,
libuim_editline_la_LIBADD, uim_module_manager_LDADD,
uim_agent_LDADD): Add libuim-scm.la
- (libuim_scm_la_SOURCES):
* New variable
* Add uim-scm.c
- (libuim_scm_la_LIBADD, libuim_scm_la_LDFLAGS,
libuim_scm_la_CPPFLAGS): New variable
- (libuim_la_LIBADD):
* Move $(GCROOTS_LIBS) to libuim_scm_la_LIBADD
* Add libuim-scm.la to make libuim dependent to libuim-scm
- (libuim_la_CPPFLAGS): Move uim-scm stuff to libuim_scm_la_CPPFLAGS
- (libuim_la_CFLAGS): Removed
* uim.pc.in
- Add -luim-scm to Libs
* examples/uim-custom/Makefile.am
* gtk/Makefile.am
* helper/Makefile.am
* qt/Makefile.am
* xim/Makefile.am
* fep/Makefile.am
* emacs/Makefile.am
- Add libuim-scm.la to *_LIBADD
Modified: trunk/doc/COMPATIBILITY
==============================================================================
--- trunk/doc/COMPATIBILITY (original)
+++ trunk/doc/COMPATIBILITY Fri Aug 24 09:28:43 2007
@@ -430,7 +430,7 @@
Affects: uim developers, IM developers
Updates: C API, libuim ABI
Version: 1.5.0
-Revision: ac4333, ac4334, ac4339, ac4347, ac4351-ac4353, ac4355, ac4444,
ac4446, ac4751, ac4761, ac4764, ac4788, ac4808, ac4812, ac4813, ac4815, ac4817,
ac4819, ac4821, ac4830, ac4870, ac4871, ac4873, ac4875, ac4877, ac4878, ac4881,
ac4882, ac4884
+Revision: ac4333, ac4334, ac4339, ac4347, ac4351-ac4353, ac4355, ac4444,
ac4446, ac4751, ac4761, ac4764, ac4788, ac4808, ac4812, ac4813, ac4815, ac4817,
ac4819, ac4821, ac4830, ac4870, ac4871, ac4873, ac4875, ac4877, ac4878, ac4881,
ac4882, ac4884, ac4885
Date: 2007-01-09 -
Modifier: YamaKen
Related: uim-scm API truth predicates reorganization in uim 1.5.0
@@ -547,6 +547,7 @@
(removed) im-return-str
(removed) im-return-str-list
Description:
+ - uim-scm has been separated from libuim as libuim-scm
- uim-scm-abbrev.h is introduced
- Scheme integer type has been changed to long from int
- return type of uim_scm_length() is changed to long from uim_lisp
Modified: trunk/emacs/Makefile.am
==============================================================================
--- trunk/emacs/Makefile.am (original)
+++ trunk/emacs/Makefile.am Fri Aug 24 09:28:43 2007
@@ -19,9 +19,11 @@
output.h debug.c debug.h
uim_el_agent_CPPFLAGS = -I$(top_srcdir)
-uim_el_agent_LDADD = $(top_builddir)/uim/libuim.la
+uim_el_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
uim_el_helper_agent_CPPFLAGS = -I$(top_srcdir)
-uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim.la
+uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
endif
Modified: trunk/examples/uim-custom/Makefile.am
==============================================================================
--- trunk/examples/uim-custom/Makefile.am (original)
+++ trunk/examples/uim-custom/Makefile.am Fri Aug 24 09:28:43 2007
@@ -1,4 +1,6 @@
-uim_libs = $(top_builddir)/uim/libuim-custom.la $(top_builddir)/uim/libuim.la
+uim_libs = $(top_builddir)/uim/libuim-custom.la \
+ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
noinst_PROGRAMS = uim-custom-variable uim-custom-dump uim-custom-update
Modified: trunk/fep/Makefile.am
==============================================================================
--- trunk/fep/Makefile.am (original)
+++ trunk/fep/Makefile.am Fri Aug 24 09:28:43 2007
@@ -8,7 +8,8 @@
uim_fep_SOURCES = uim-fep.c uim-fep.h udsock.c udsock.h str.c str.h
callbacks.c callbacks.h draw.c draw.h escseq.c escseq.h key.c key.h read.c
read.h helper.c helper.h
uim_fep_CPPFLAGS = -I$(top_srcdir)
uim_fep_CFLAGS =
-uim_fep_LDADD = $(top_builddir)/uim/libuim.la @FEP_LIBADD@
+uim_fep_LDADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la @FEP_LIBADD@
uim_fep_tick_SOURCES = uim-fep-tick.c uim-fep.h udsock.c udsock.h
uim_fep_tick_LDADD = $(top_builddir)/replace/libreplace.la
Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am (original)
+++ trunk/gtk/Makefile.am Fri Aug 24 09:28:43 2007
@@ -14,7 +14,8 @@
im_uim_la_SOURCES = $(IM_UIM_SOURCES)
im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
-im_uim_la_LIBADD = $(top_builddir)/uim/libuim.la $(EBLIB_LIBS)
+im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la $(EBLIB_LIBS)
IM_UIM_SOURCES = \
Modified: trunk/helper/Makefile.am
==============================================================================
--- trunk/helper/Makefile.am (original)
+++ trunk/helper/Makefile.am Fri Aug 24 09:28:43 2007
@@ -6,6 +6,7 @@
libexec_PROGRAMS = uim-toolbar-applet
uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \
+ $(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME_CFLAGS@
@@ -57,28 +58,34 @@
uim_candwin_gtk_SOURCES = candwin-gtk.c \
../gtk/caret-state-indicator.c \
../gtk/caret-state-indicator.h
-uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
+uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir)
uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
uim_toolbar_gtk_SOURCES = toolbar-standalone-gtk.c toolbar-common-gtk.c
-uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
+uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
uim_toolbar_gtk_systray_SOURCES = toolbar-systray-gtk.c toolbar-common-gtk.c \
eggtrayicon.c eggtrayicon.h
-uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
+uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
+ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ -Wall
uim_im_switcher_gtk_SOURCES = im-switcher-gtk.c
-uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
+uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
uim_input_pad_ja_SOURCES = input-pad-ja.c
-uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
+uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ -Wall
@@ -89,6 +96,7 @@
pref-gtk-keytab.h \
../gtk/key-util-gtk.c ../gtk/key-util-gtk.h
uim_pref_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \
+ $(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
@@ -97,7 +105,8 @@
if DICT
uim_dict_gtk_SOURCES = dict-main-gtk.c dict-canna-cclass.c
dict-canna-cclass.h dict-word-win-gtk.c dict-word-win-gtk.h
dict-word-list-win-gtk.c dict-word-list-win-gtk.h dict-util.c dict-util.h
dict-word-list-view-gtk.c dict-word-list-view-gtk.h dict-word.c dict-word.h
dict-dict.c dict-dict.h dict-cclass-dialog.c dict-cclass-dialog.h
-uim_dict_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
+uim_dict_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
uim_dict_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
uim_dict_gtk_CFLAGS = @GTK2_CFLAGS@
uim_dict_uidir = $(datadir)/uim/helperdata
Modified: trunk/qt/Makefile.am
==============================================================================
--- trunk/qt/Makefile.am (original)
+++ trunk/qt/Makefile.am Fri Aug 24 09:28:43 2007
@@ -105,7 +105,8 @@
immodule-subwindow.cpp immodule-subwindow.h
libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS)
libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
-libquiminputcontextplugin_la_LIBADD = $(top_builddir)/uim/libuim.la
+libquiminputcontextplugin_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
immodule-candidatewindow.cpp: immodule-candidatewindow.moc
immodule-qhelpermanager.cpp: immodule-qhelpermanager.moc
@@ -121,7 +122,8 @@
toolbar-common-quimhelpertoolbar.h
toolbar-common-uimstateindicator.h
libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS)
libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
-libtoolbarcommon_la_LIBADD = $(top_builddir)/uim/libuim.la
+libtoolbarcommon_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
toolbar-common-quimhelpertoolbar.cpp: toolbar-common-quimhelpertoolbar.moc
toolbar-common-uimstateindicator.cpp: toolbar-common-uimstateindicator.moc
@@ -130,7 +132,8 @@
toolbar-common-quimhelpertoolbar.h
toolbar-common-uimstateindicator.h
uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS)
uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS)
-uim_toolbar_qt_LDADD = $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
+uim_toolbar_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
toolbar-standalone-qt.cpp: toolbar-standalone-qt.moc
# Toolbar applet
@@ -139,7 +142,9 @@
toolbar-common-quimhelpertoolbar.h
toolbar-common-uimstateindicator.h
uim_panelapplet_la_CXXFLAGS = [EMAIL PROTECTED]@ $(QT_CXXFLAGS)
uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined
-Wl,--no-undefined -Wl,--allow-shlib-undefined [EMAIL PROTECTED]@ $(QT_LDFLAGS)
-uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim.la
libtoolbarcommon.la -lkdeui -lkdecore
+uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la \
+ libtoolbarcommon.la -lkdeui -lkdecore
toolbar-applet-kde.cpp: toolbar-applet-kde.moc
endif
@@ -147,14 +152,16 @@
uim_candwin_qt_SOURCES = candwin-qt.cpp candwin-qt.h qtgettext.h
uim_candwin_qt_CXXFLAGS = $(QT_CXXFLAGS)
uim_candwin_qt_LDFLAGS = $(QT_LDFLAGS)
-uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim.la
+uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
candwin-qt.cpp: candwin-qt.moc
# Switcher
uim_im_switcher_qt_SOURCES = switcher-qt.cpp switcher-qt.h qtgettext.h
uim_im_switcher_qt_CXXFLAGS = $(QT_CXXFLAGS)
uim_im_switcher_qt_LDFLAGS = $(QT_LDFLAGS)
-uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim.la
+uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
switcher-qt.cpp: switcher-qt.moc
@@ -172,7 +179,9 @@
uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS)
uim_pref_qt_LDFLAGS = $(QT_LDFLAGS)
-uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-custom.la
$(top_builddir)/uim/libuim.la
+uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-custom.la \
+ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
pref-customwidgets.h:pref-olisteditformbase.h pref-keyeditformbase.h
Modified: trunk/uim.pc.in
==============================================================================
--- trunk/uim.pc.in (original)
+++ trunk/uim.pc.in Fri Aug 24 09:28:43 2007
@@ -11,4 +11,4 @@
Description: multilingual input method library
Version: @VERSION@
Cflags: -I${includedir}/uim
-Libs: -L${libdir} -luim @LIBINTL@ @LIBICONV@
+Libs: -L${libdir} -luim-scm -luim @LIBINTL@ @LIBICONV@
Modified: trunk/uim/Makefile.am
==============================================================================
--- trunk/uim/Makefile.am (original)
+++ trunk/uim/Makefile.am Fri Aug 24 09:28:43 2007
@@ -10,7 +10,7 @@
# FIXME: $(UIM_SCM_CFLAGS) should only affect on uim-scm.c
CFLAGS = @CFLAGS@ $(UIM_SCM_CFLAGS)
-lib_LTLIBRARIES = libuim.la libuim-custom.la
+lib_LTLIBRARIES = libuim-scm.la libuim.la libuim-custom.la
# Although uim only needs *.so for the plugins, whether *.la is
# installed or not is system-dependent and uim leaves it untouched. It
@@ -34,7 +34,7 @@
uim-helper.h uim-im-switcher.h \
uim-custom.h
-libuim_la_SOURCES = uim-scm.c \
+libuim_la_SOURCES = \
uim-internal.h uim-error.c uim.c \
uim-key.c uim-func.c uim-util.c \
iconv.c plugin.c \
@@ -47,7 +47,7 @@
if M17NLIB
uim_plugin_LTLIBRARIES += libuim-m17nlib.la
libuim_m17nlib_la_SOURCES = m17nlib.c
- libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim.la
+ libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim-scm.la libuim.la
libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir) @M17NLIB_CFLAGS@
endif
@@ -55,7 +55,7 @@
if SCIM
uim_plugin_LTLIBRARIES += libuim-scim.la
libuim_scim_la_SOURCES = scim.cpp
- libuim_scim_la_LIBADD = @SCIM_LIBS@ libuim.la
+ libuim_scim_la_LIBADD = @SCIM_LIBS@ libuim-scm.la libuim.la
libuim_scim_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_scim_la_CXXFLAGS = -I$(top_srcdir) @SCIM_CFLAGS@
endif
@@ -63,7 +63,7 @@
if CANNA
uim_plugin_LTLIBRARIES += libuim-canna.la
libuim_canna_la_SOURCES = canna.c
- libuim_canna_la_LIBADD = libuim.la -lcanna
+ libuim_canna_la_LIBADD = libuim-scm.la libuim.la -lcanna
libuim_canna_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_canna_la_CPPFLAGS = -I$(top_srcdir)
endif
@@ -74,7 +74,7 @@
else
uim_plugin_LTLIBRARIES += libuim-anthy.la
libuim_anthy_la_SOURCES = anthy.c
- libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim.la
+ libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim-scm.la libuim.la
libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_anthy_la_CPPFLAGS = -I$(top_srcdir)
endif
@@ -86,7 +86,7 @@
else
uim_plugin_LTLIBRARIES += libuim-anthy-utf8.la
libuim_anthy_utf8_la_SOURCES = anthy-utf8.c
- libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ libuim.la
+ libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ libuim-scm.la libuim.la
libuim_anthy_utf8_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_anthy_utf8_la_CPPFLAGS = -I$(top_srcdir) @ANTHY_UTF8_CFLAGS@
endif
@@ -95,7 +95,7 @@
if MANA
uim_plugin_LTLIBRARIES += libuim-mana.la
libuim_mana_la_SOURCES = mana.c
-libuim_mana_la_LIBADD = libuim.la
+libuim_mana_la_LIBADD = libuim-scm.la libuim.la
libuim_mana_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_mana_la_CPPFLAGS = -I$(top_srcdir)
endif
@@ -103,44 +103,52 @@
if PRIME
uim_plugin_LTLIBRARIES += libuim-prime.la
libuim_prime_la_SOURCES = prime.c
- libuim_prime_la_LIBADD = libuim.la
+ libuim_prime_la_LIBADD = libuim-scm.la libuim.la
libuim_prime_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_prime_la_CPPFLAGS = -I$(top_srcdir)
endif
uim_plugin_LTLIBRARIES += libuim-skk.la
libuim_skk_la_SOURCES = skk.c
-libuim_skk_la_LIBADD = libuim.la @NETLIBS@
+libuim_skk_la_LIBADD = libuim-scm.la libuim.la @NETLIBS@
libuim_skk_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_skk_la_CPPFLAGS = -I$(top_srcdir)
uim_plugin_LTLIBRARIES += libuim-look.la
libuim_look_la_SOURCES = look.c
-libuim_look_la_LIBADD = libuim.la
+libuim_look_la_LIBADD = libuim-scm.la libuim.la
libuim_look_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_look_la_CPPFLAGS = -I$(top_srcdir)
libuimincludedir = $(includedir)/uim
+libuim_scm_la_SOURCES = uim-scm.c
+libuim_scm_la_LIBADD = $(GCROOTS_LIBS)
+libuim_scm_la_LDFLAGS = -version-info $(libuim_scm_version) -export-dynamic
+libuim_scm_la_CPPFLAGS = -I$(top_srcdir) \
+ -I$(top_builddir)/sigscheme/include \
+ -I$(top_srcdir)/sigscheme/src \
+ -I$(top_builddir)/sigscheme/src \
+ $(GCROOTS_CFLAGS)
+# Since the generated Makefile will have the order
+# '$(libuim_scm_la_CFLAGS) $(CFLAGS)', overriding -Werror in $CFLAGS
+# by -Wno-error in $UIM_SCM_CFLAGS does not work.
+#libuim_scm_la_CFLAGS = $(UIM_SCM_CFLAGS)
+
# NOTE: Don't depend on -export-symbols-regex to avoid symbol
# conflict. The libtool option is not and will not be supported on
# some platforms. See [Anthy-dev 2847]. -- YamaKen 2006-03-30
libuim_la_LDFLAGS = -version-info $(libuim_version) -export-dynamic
-libuim_la_LIBADD = $(GCROOTS_LIBS) \
- @LTLIBINTL@ @LTLIBICONV@ \
+libuim_la_LIBADD = @LTLIBINTL@ @LTLIBICONV@ \
+ libuim-scm.la \
$(top_builddir)/replace/libreplace.la
# - Place -I$(top_srcdir) surely prior to sigscheme dirs
# - To take precedence over installed gcroots.h by the bundled
# libgcroots/include/gcroots.h, @GCROOTS_CFLAGS@ must be placed here.
libuim_la_CPPFLAGS = $(uim_defs) \
-I$(top_srcdir) \
- -I$(top_builddir)/sigscheme/include \
- -I$(top_srcdir)/sigscheme/src \
- -I$(top_builddir)/sigscheme/src \
- $(GCROOTS_CFLAGS) \
-DPKGLIBDIR=\"$(pkglibdir)\" \
-DPKGDATADIR=\"$(pkgdatadir)\"
-libuim_la_CFLAGS = $(UIM_SCM_CFLAGS)
if ENABLE_ANTHY_STATIC
libuim_la_LIBADD += @ANTHY_LIBS@
@@ -157,12 +165,12 @@
libuim_custom_la_LDFLAGS = -version-info $(libuim_custom_version) \
-export-dynamic
-libuim_custom_la_LIBADD = libuim.la
+libuim_custom_la_LIBADD = libuim-scm.la libuim.la
libuim_custom_la_CPPFLAGS = $(uim_defs) -I$(top_srcdir)
uim_plugin_LTLIBRARIES += libuim-custom-enabler.la
libuim_custom_enabler_la_SOURCES = uim-custom-enabler.c
-libuim_custom_enabler_la_LIBADD = libuim-custom.la libuim.la
+libuim_custom_enabler_la_LIBADD = libuim-custom.la libuim-scm.la libuim.la
libuim_custom_enabler_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version
-module
libuim_custom_enabler_la_CPPFLAGS = -I$(top_srcdir)
@@ -179,13 +187,13 @@
uim_sh_LIBS =
uim_sh_CPPFLAGS = $(uim_defs) -I$(top_srcdir)
uim_sh_CFLAGS =
-uim_sh_LDADD = libuim.la
+uim_sh_LDADD = libuim-scm.la libuim.la
uim_sh_SOURCES = uim-sh.c
if LIBEDIT
uim_plugin_LTLIBRARIES += libuim-editline.la
libuim_editline_la_SOURCES = editline.c
- libuim_editline_la_LIBADD = @LIBEDIT_LIBS@ libuim.la
+ libuim_editline_la_LIBADD = @LIBEDIT_LIBS@ libuim-scm.la libuim.la
libuim_editline_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_editline_la_CPPFLAGS = -I$(top_srcdir)
endif
@@ -193,10 +201,10 @@
uim_module_manager_LIBS =
uim_module_manager_CPPFLAGS = $(uim_defs) -I$(top_srcdir)
-DUIM_DATADIR=\""$(datadir)/uim"\"
uim_module_manager_CFLAGS =
-uim_module_manager_LDADD = libuim.la
+uim_module_manager_LDADD = libuim-scm.la libuim.la
uim_module_manager_SOURCES = uim-module-manager.c
noinst_PROGRAMS = uim-agent
uim_agent_SOURCES = agent.c
-uim_agent_LDADD = libuim.la
+uim_agent_LDADD = libuim-scm.la libuim.la
Modified: trunk/uim/libtool-version.mk
==============================================================================
--- trunk/uim/libtool-version.mk (original)
+++ trunk/uim/libtool-version.mk Fri Aug 24 09:28:43 2007
@@ -2,4 +2,5 @@
# See "Versioning" section of info of libtool for each meaning.
libuim_version = 6:0:0
+libuim_scm_version = 0:0:0
libuim_custom_version = 2:0:0
Modified: trunk/xim/Makefile.am
==============================================================================
--- trunk/xim/Makefile.am (original)
+++ trunk/xim/Makefile.am Fri Aug 24 09:28:43 2007
@@ -4,7 +4,8 @@
bin_PROGRAMS = uim-xim
uim_xim_LDFLAGS = @X_LIBS@
-uim_xim_LDADD = -lXext -lX11 $(top_builddir)/uim/libuim.la
+uim_xim_LDADD = -lXext -lX11 $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
uim_xim_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
uim_xim_CFLAGS = @X_CFLAGS@ -Wall
uim_xim_CXXFLAGS = @X_CFLAGS@ -Wall
