--- qt/Makefile.in.orig Mon Aug 14 13:28:21 2006 +++ qt/Makefile.in Mon Aug 21 01:27:53 2006 @@ -95,8 +95,6 @@ "$(DESTDIR)$(libexecdir)" extraLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(extra_LTLIBRARIES) $(noinst_LTLIBRARIES) -@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = \ -@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la am__libquiminputcontextplugin_la_SOURCES_DIST = \ immodule-candidatewindow.cpp immodule-qhelpermanager.cpp \ immodule-plugin.cpp immodule-candidatewindow.h \ @@ -118,8 +116,6 @@ $(am_libquiminputcontextplugin_la_OBJECTS) @QT_IMMODULE_TRUE@@QT_TRUE@am_libquiminputcontextplugin_la_rpath = \ @QT_IMMODULE_TRUE@@QT_TRUE@ -rpath $(extradir) -@QT_TRUE@libtoolbarcommon_la_DEPENDENCIES = \ -@QT_TRUE@ $(top_builddir)/uim/libuim.la am__libtoolbarcommon_la_SOURCES_DIST = \ toolbar-common-quimhelpertoolbar.cpp \ toolbar-common-uimstateindicator.cpp qtgettext.h \ @@ -138,14 +134,11 @@ @QT_TRUE@am_uim_candwin_qt_OBJECTS = \ @QT_TRUE@ uim_candwin_qt-candwin-qt.$(OBJEXT) uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS) -@QT_TRUE@uim_candwin_qt_DEPENDENCIES = $(top_builddir)/uim/libuim.la am__uim_im_switcher_qt_SOURCES_DIST = switcher-qt.cpp switcher-qt.h \ qtgettext.h @QT_TRUE@am_uim_im_switcher_qt_OBJECTS = \ @QT_TRUE@ uim_im_switcher_qt-switcher-qt.$(OBJEXT) uim_im_switcher_qt_OBJECTS = $(am_uim_im_switcher_qt_OBJECTS) -@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES = \ -@QT_TRUE@ $(top_builddir)/uim/libuim.la am__uim_pref_qt_SOURCES_DIST = pref-qt.cpp pref-customwidgets.cpp \ pref-kseparator.cpp qtgettext.h pref-qt.h pref-customwidgets.h \ pref-kseparator.h @@ -157,9 +150,6 @@ @PREF_TRUE@@QT_TRUE@ uim_pref_qt-pref-keyeditformbase.$(OBJEXT) uim_pref_qt_OBJECTS = $(am_uim_pref_qt_OBJECTS) \ $(nodist_uim_pref_qt_OBJECTS) -@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = \ -@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la \ -@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la am__uim_toolbar_qt_SOURCES_DIST = toolbar-standalone-qt.cpp \ toolbar-standalone-qt.h qtgettext.h \ toolbar-common-quimhelpertoolbar.h \ @@ -167,8 +157,7 @@ @QT_TRUE@am_uim_toolbar_qt_OBJECTS = \ @QT_TRUE@ uim_toolbar_qt-toolbar-standalone-qt.$(OBJEXT) uim_toolbar_qt_OBJECTS = $(am_uim_toolbar_qt_OBJECTS) -@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = $(top_builddir)/uim/libuim.la \ -@QT_TRUE@ ./libtoolbarcommon.la +@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = ./libtoolbarcommon.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/uim depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -502,7 +491,6 @@ @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS) @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version -@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD = $(top_builddir)/uim/libuim.la # Toolbar Common @QT_TRUE@noinst_LTLIBRARIES = libtoolbarcommon.la @@ -511,7 +499,6 @@ @QT_TRUE@libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS) @QT_TRUE@libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version -@QT_TRUE@libtoolbarcommon_la_LIBADD = $(top_builddir)/uim/libuim.la # Toolbar Standalone @QT_TRUE@uim_toolbar_qt_SOURCES = toolbar-standalone-qt.cpp toolbar-standalone-qt.h qtgettext.h \ @@ -519,19 +506,17 @@ @QT_TRUE@uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS) @QT_TRUE@uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS) -@QT_TRUE@uim_toolbar_qt_LDADD = $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la +@QT_TRUE@uim_toolbar_qt_LDADD = ./libtoolbarcommon.la # Candidate Window @QT_TRUE@uim_candwin_qt_SOURCES = candwin-qt.cpp candwin-qt.h qtgettext.h @QT_TRUE@uim_candwin_qt_CXXFLAGS = $(QT_CXXFLAGS) @QT_TRUE@uim_candwin_qt_LDFLAGS = $(QT_LDFLAGS) -@QT_TRUE@uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim.la # Switcher @QT_TRUE@uim_im_switcher_qt_SOURCES = switcher-qt.cpp switcher-qt.h qtgettext.h @QT_TRUE@uim_im_switcher_qt_CXXFLAGS = $(QT_CXXFLAGS) @QT_TRUE@uim_im_switcher_qt_LDFLAGS = $(QT_LDFLAGS) -@QT_TRUE@uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim.la # Pref @PREF_TRUE@@QT_TRUE@nodist_uim_pref_qt_SOURCES = \ @@ -547,7 +532,6 @@ @PREF_TRUE@@QT_TRUE@uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS) @PREF_TRUE@@QT_TRUE@uim_pref_qt_LDFLAGS = $(QT_LDFLAGS) -@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-custom.la $(top_builddir)/uim/libuim.la @QT_TRUE@CLEANFILES = \ @QT_TRUE@ $(MOC_FILES) \ @QT_TRUE@ $(UI_TMP_FILES)