[uim-commit] r1356 - in branches/r5rs: examples/uim-custom fep gtk helper qt xim

yamaken at freedesktop.org yamaken at freedesktop.org
Mon Aug 29 04:57:31 PDT 2005 

Author: yamaken
Date: 2005-08-29 04:57:29 -0700 (Mon, 29 Aug 2005)
New Revision: 1356

Modified:
   branches/r5rs/examples/uim-custom/Makefile.am
   branches/r5rs/fep/Makefile.am
   branches/r5rs/gtk/Makefile.am
   branches/r5rs/helper/Makefile.am
   branches/r5rs/qt/Makefile.am
   branches/r5rs/xim/Makefile.am
Log:
* qt/Makefile.am
* gtk/Makefile.am
* fep/Makefile.am
* helper/Makefile.am
* xim/Makefile.am
* examples/uim-custom/Makefile.am
  - Revert all changes of r1355 since libsscm should not link
    against libuim clients directly.

    libsscm should be linked implicitly via libuim. See objdump
    -p libuim.so and find NEEDED libsscm.so* is
    existing. Appropriate library path is needed instead of
    explicit -lsscm.


Modified: branches/r5rs/examples/uim-custom/Makefile.am
===================================================================
--- branches/r5rs/examples/uim-custom/Makefile.am	2005-08-29 11:40:01 UTC (rev 1355)
+++ branches/r5rs/examples/uim-custom/Makefile.am	2005-08-29 11:57:29 UTC (rev 1356)
@@ -1,4 +1,4 @@
-uim_libs   = $(top_builddir)/uim/libuim-custom.la $(top_builddir)/uim/libuim.la $(top_builddir)/sigscheme/libsscm.la
+uim_libs   = $(top_builddir)/uim/libuim-custom.la $(top_builddir)/uim/libuim.la
 
 noinst_PROGRAMS = uim-custom-variable uim-custom-dump uim-custom-update
 

Modified: branches/r5rs/fep/Makefile.am
===================================================================
--- branches/r5rs/fep/Makefile.am	2005-08-29 11:40:01 UTC (rev 1355)
+++ branches/r5rs/fep/Makefile.am	2005-08-29 11:57:29 UTC (rev 1356)
@@ -8,7 +8,7 @@
 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
 uim_fep_CPPFLAGS = -I$(top_srcdir)
 uim_fep_CFLAGS =
-uim_fep_LDADD = $(top_builddir)/uim/libuim.la @FEP_LIBADD@ $(top_builddir)/sigscheme/libsscm.la
+uim_fep_LDADD = $(top_builddir)/uim/libuim.la @FEP_LIBADD@
 
 uim_fep_tick_SOURCES = uim-fep-tick.c uim-fep.h udsock.c udsock.h
 

Modified: branches/r5rs/gtk/Makefile.am
===================================================================
--- branches/r5rs/gtk/Makefile.am	2005-08-29 11:40:01 UTC (rev 1355)
+++ branches/r5rs/gtk/Makefile.am	2005-08-29 11:57:29 UTC (rev 1356)
@@ -11,7 +11,7 @@
 
 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) $(top_builddir)/sigscheme/libsscm.la
+im_uim_la_LIBADD = $(top_builddir)/uim/libuim.la $(EBLIB_LIBS)
 
 
 IM_UIM_SOURCES = \

Modified: branches/r5rs/helper/Makefile.am
===================================================================
--- branches/r5rs/helper/Makefile.am	2005-08-29 11:40:01 UTC (rev 1355)
+++ branches/r5rs/helper/Makefile.am	2005-08-29 11:57:29 UTC (rev 1356)
@@ -1,13 +1,12 @@
 EXTRA_DIST = GNOME_UimApplet.server.in.in 
 
 helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
-uim_corelibs = $(top_builddir)/uim/libuim.la $(top_builddir)/sigscheme/libsscm.la
 
 if APPLET
 
 libexec_PROGRAMS =  uim-toolbar-applet
 
-uim_toolbar_applet_LDADD = @GNOME2_LIBS@ @GTK2_LIBS@ @APPLET_LIBS@ $(uim_corelibs)
+uim_toolbar_applet_LDADD = @GNOME2_LIBS@ @GTK2_LIBS@ @APPLET_LIBS@  $(top_builddir)/uim/libuim.la
 uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
 uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_CFLAGS@ @GNOME2_CFLAGS@ -Wall
 
@@ -52,40 +51,41 @@
 uim_candwin_gtk_SOURCES  = helper-candwin-gtk.c \
 			   ../gtk/caret-state-indicator.c \
 			   ../gtk/caret-state-indicator.h
-uim_candwin_gtk_LDADD    = @GTK2_LIBS@ $(uim_corelibs)
+uim_candwin_gtk_LDADD    = @GTK2_LIBS@ $(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@ $(uim_corelibs)
+uim_toolbar_gtk_LDADD    = @GTK2_LIBS@ $(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@ $(uim_corelibs)
+uim_toolbar_gtk_systray_LDADD    = @GTK2_LIBS@ $(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@ $(uim_corelibs)
+uim_im_switcher_gtk_LDADD    = @GTK2_LIBS@ $(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@ $(uim_corelibs)
+uim_input_pad_ja_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
 uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 uim_input_pad_ja_CFLAGS   = @GTK2_CFLAGS@ -Wall
 
 if GTK2_4
 uim_pref_gtk_SOURCES  = pref-gtk.c pref-gtk-custom-widgets.c pref-gtk-custom-widgets.h
-uim_pref_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la $(uim_corelibs)
+uim_pref_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.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
 endif
 
 if DICT
 uim_dict_gtk_SOURCES  = dict-main-gtk.c dict-anthy.c dict-anthy.h dict-canna.c dict-canna.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@ $(uim_corelibs)
+uim_dict_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
 uim_dict_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 uim_dict_gtk_CFLAGS   = @GTK2_CFLAGS@
 endif

Modified: branches/r5rs/qt/Makefile.am
===================================================================
--- branches/r5rs/qt/Makefile.am	2005-08-29 11:40:01 UTC (rev 1355)
+++ branches/r5rs/qt/Makefile.am	2005-08-29 11:57:29 UTC (rev 1356)
@@ -1,5 +1,4 @@
 EXTRA_DIST = pref-keyeditformbase.ui  pref-olisteditformbase.ui bushu.t
-uim_corelibs = $(top_builddir)/uim/libuim.la $(top_builddir)/sigscheme/libsscm.la
 
 if QT
 
@@ -79,7 +78,7 @@
 	immodule-subwindow.cpp immodule-subwindow.h
 libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS)
 libquiminputcontextplugin_la_LDFLAGS  = $(QT_LDFLAGS) -avoid-version
-libquiminputcontextplugin_la_LIBADD   = $(uim_corelibs)
+libquiminputcontextplugin_la_LIBADD   = $(top_builddir)/uim/libuim.la
 
 immodule-candidatewindow.cpp: immodule-candidatewindow.moc
 immodule-qhelpermanager.cpp: immodule-qhelpermanager.moc
@@ -94,7 +93,7 @@
 			       toolbar-common-quimhelpertoolbar.h   toolbar-common-uimstateindicator.h
 libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS)
 libtoolbarcommon_la_LDFLAGS  = $(QT_LDFLAGS) -avoid-version
-libtoolbarcommon_la_LIBADD   = $(uim_corelibs)
+libtoolbarcommon_la_LIBADD   = $(top_builddir)/uim/libuim.la
 toolbar-common-quimhelpertoolbar.cpp: toolbar-common-quimhelpertoolbar.moc
 toolbar-common-uimstateindicator.cpp: toolbar-common-uimstateindicator.moc
 
@@ -103,21 +102,21 @@
 			 toolbar-common-quimhelpertoolbar.h toolbar-common-uimstateindicator.h
 uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS)
 uim_toolbar_qt_LDFLAGS  = $(QT_LDFLAGS)
-uim_toolbar_qt_LDADD    = $(uim_corelibs) ./libtoolbarcommon.la
+uim_toolbar_qt_LDADD    = $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
 toolbar-standalone-qt.cpp: toolbar-standalone-qt.moc
 
 # Candidate Window
 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 $(top_builddir)/sigscheme/libsscm.la
+uim_candwin_qt_LDADD = $(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    = $(uim_corelibs)
+uim_im_switcher_qt_LDADD    = $(top_builddir)/uim/libuim.la
 switcher-qt.cpp: switcher-qt.moc
 
 # Pref
@@ -129,7 +128,7 @@
 
 uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS)
 uim_pref_qt_LDFLAGS  = $(QT_LDFLAGS)
-uim_pref_qt_LDADD    = $(top_builddir)/uim/libuim-custom.la $(uim_corelibs)
+uim_pref_qt_LDADD    = $(top_builddir)/uim/libuim-custom.la $(top_builddir)/uim/libuim.la
 
 pref-customwidgets.h:pref-olisteditformbase.h pref-keyeditformbase.h
 pref-qt.h:pref-olisteditformbase.h pref-keyeditformbase.h
@@ -161,7 +160,7 @@
 	qtgettext.h
 uim_chardict_qt_CXXFLAGS = $(QT_CXXFLAGS) -DBUSHUDICT=\"$(datadir)/uim/helperdata/bushu.t\"
 uim_chardict_qt_LDFLAGS  = $(QT_LDFLAGS)
-uim_chardict_qt_LDADD    = $(uim_corelibs)
+uim_chardict_qt_LDADD    = $(top_builddir)/uim/libuim.la
 chardict-qt.cpp: chardict-qt.moc
 
 chardict-bushuviewwidget.cpp: chardict-bushuviewwidget.moc

Modified: branches/r5rs/xim/Makefile.am
===================================================================
--- branches/r5rs/xim/Makefile.am	2005-08-29 11:40:01 UTC (rev 1355)
+++ branches/r5rs/xim/Makefile.am	2005-08-29 11:57:29 UTC (rev 1356)
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = uim-xim
 uim_xim_LDFLAGS =  @X_LIBS@
-uim_xim_LDADD =  -lXext -lX11 $(top_builddir)/uim/libuim.la $(top_builddir)/sigscheme/libsscm.la
+uim_xim_LDADD =  -lXext -lX11 $(top_builddir)/uim/libuim.la
 uim_xim_CPPFLAGS = -I$(top_srcdir)
 uim_xim_CFLAGS = @X_CFLAGS@ -Wall
 uim_xim_CXXFLAGS = @X_CFLAGS@ -Wall

More information about the uim-commit mailing list