1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
--- qt/Makefile.in.orig 2008-05-06 14:23:16.000000000 +0900
+++ qt/Makefile.in 2008-05-06 23:25:02.000000000 +0900
@@ -107,10 +107,6 @@
extraLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(applet_LTLIBRARIES) $(extra_LTLIBRARIES) \
$(noinst_LTLIBRARIES)
-@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(am__append_10)
am__libquiminputcontextplugin_la_SOURCES_DIST = \
immodule-candidatewindow.cpp immodule-qhelpermanager.cpp \
immodule-plugin.cpp immodule-plugin.h \
@@ -141,9 +137,6 @@
$(libquiminputcontextplugin_la_LDFLAGS) $(LDFLAGS) -o $@
@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-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
am__libtoolbarcommon_la_SOURCES_DIST = \
toolbar-common-quimhelpertoolbar.cpp \
toolbar-common-uimstateindicator.cpp qtgettext.h \
@@ -158,8 +151,6 @@
$(libtoolbarcommon_la_LDFLAGS) $(LDFLAGS) -o $@
@QT_TRUE@am_libtoolbarcommon_la_rpath =
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_DEPENDENCIES = \
-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la
am__uim_panelapplet_la_SOURCES_DIST = toolbar-applet-kde.cpp \
toolbar-applet-kde.h qtgettext.h \
@@ -183,8 +174,8 @@
@QT_TRUE@ uim_candwin_qt-candwin-qt.$(OBJEXT)
uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS)
@QT_TRUE@uim_candwin_qt_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@ -luim-scm \
+@QT_TRUE@ -luim
uim_candwin_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_candwin_qt_CXXFLAGS) $(CXXFLAGS) \
@@ -195,8 +186,8 @@
@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-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@ -luim-scm \
+@QT_TRUE@ -luim
uim_im_switcher_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_im_switcher_qt_CXXFLAGS) $(CXXFLAGS) \
@@ -212,10 +203,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-scm.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la
uim_pref_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(uim_pref_qt_CXXFLAGS) \
$(CXXFLAGS) $(uim_pref_qt_LDFLAGS) $(LDFLAGS) -o $@
@@ -226,9 +213,6 @@
@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 = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
uim_toolbar_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_toolbar_qt_CXXFLAGS) $(CXXFLAGS) \
@@ -577,8 +561,8 @@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS) @X_CFLAGS@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD = \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
+@QT_IMMODULE_TRUE@@QT_TRUE@ -luim-scm \
+@QT_IMMODULE_TRUE@@QT_TRUE@ -luim \
@QT_IMMODULE_TRUE@@QT_TRUE@ $(am__append_10)
# Toolbar Common
@@ -588,8 +572,8 @@
@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-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@libtoolbarcommon_la_LIBADD = -luim-scm \
+@QT_TRUE@ -luim
# Toolbar Standalone
@@ -598,8 +582,8 @@
@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-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
+@QT_TRUE@uim_toolbar_qt_LDADD = -luim-scm \
+@QT_TRUE@ -luim ./libtoolbarcommon.la
# Toolbar applet
@@ -608,8 +592,8 @@
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_CXXFLAGS = -I@KDE_INCLUDE_DIR@ $(QT_CXXFLAGS)
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
-@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
+@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = -luim-scm \
+@APPLET_KDE_TRUE@@QT_TRUE@ -luim \
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la -lkdeui -lkdecore
@@ -617,16 +601,16 @@
@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-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@uim_candwin_qt_LDADD = -luim-scm \
+@QT_TRUE@ -luim
# 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-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@uim_im_switcher_qt_LDADD = -luim-scm \
+@QT_TRUE@ -luim
# Pref
@@ -643,9 +627,9 @@
@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 \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = -luim-custom \
+@PREF_TRUE@@QT_TRUE@ -luim-scm \
+@PREF_TRUE@@QT_TRUE@ -luim
@QT_TRUE@CLEANFILES = \
@QT_TRUE@ $(MOC_FILES) \
|
