@@ -13,7 +13,7 @@ GCIN_SO= gcin1.so gcin2.so
13
13
OBJS =gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
14
14
gcin-switch.o gcin-exec-script.o $(GCIN_SO ) pho-play.o cache.o gtk_bug_fix.o \
15
15
$(gcin_pho_o ) $(gcin_gtab_o ) gcin-common.o phrase.o t2s-lookup.o gtab-use-count.o \
16
- win-save-phrase.o unix-exec.o
16
+ win-save-phrase.o unix-exec.o pho-kbm-name.o statistic.o
17
17
18
18
OBJS_TSLEARN =tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
19
19
table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o pho-dbg.o
@@ -30,7 +30,7 @@ OBJS_gcin2tab=gcin2tab.o gtab-util.o util.o locale.o
30
30
OBJS_gtab_merge =gtab-merge.o gtab-util.o util.o locale.o
31
31
OBJS_gcin_steup =gcin-setup.o gcin-conf.o util.o gcin-send.o gcin-settings.o \
32
32
gcin-setup-list.o gcin-switch.o locale.o gcin-setup-pho.o about.o \
33
- gcin-icon.o gcin-setup-gtab.o gtab-list.o gcin-exec-script.o
33
+ gcin-icon.o gcin-setup-gtab.o gtab-list.o gcin-exec-script.o pho-kbm-name.o
34
34
35
35
OBJS_gcin_gb_toggle = gcin-gb-toggle.o gcin-conf.o util.o gcin-send.o
36
36
OBJS_gcin_kbm_toggle = gcin-kbm-toggle.o gcin-conf.o util.o gcin-send.o
@@ -125,46 +125,41 @@ endif
125
125
if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
126
126
if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im; fi
127
127
128
+ # gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path)
129
+
128
130
gcin : $(OBJS ) $(IMdkitLIB ) $(OBJ_IMSRV )
129
- LD_RUN_PATH=$(gcin_ld_run_path ) \
130
- $(CCLD ) $(EXTRA_LDFLAGS ) -o $@ $(OBJS ) $(IMdkitLIB ) $(OBJ_IMSRV ) -lXtst $(LDFLAGS ) -L/usr/X11R6/lib
131
+ $(CCLD ) $(EXTRA_LDFLAGS ) $(gcc_ld_run_path ) -o $@ $(OBJS ) $(IMdkitLIB ) $(OBJ_IMSRV ) -lXtst $(LDFLAGS ) -L/usr/X11R6/lib
131
132
rm -f core.* vgcore.*
132
133
ln -sf $@ $@ .test
133
134
134
135
gcin-nocur : $(OBJS ) $(IMdkitLIB ) $(OBJ_IMSRV )
135
- LD_RUN_PATH=$(gcinlibdir ) \
136
- $(CCLD ) $(EXTRA_LDFLAGS ) -o $@ $(OBJS ) $(IMdkitLIB ) $(OBJ_IMSRV ) -lXtst $(LDFLAGS ) -L/usr/X11R6/lib
136
+ $(CCLD ) -Wl,-rpath,$(gcinlibdir ) $(EXTRA_LDFLAGS ) -o $@ $(OBJS ) $(IMdkitLIB ) $(OBJ_IMSRV ) -lXtst $(LDFLAGS ) -L/usr/X11R6/lib
137
137
rm -f core.*
138
138
139
139
tslearn : $(OBJS_TSLEARN )
140
- export LD_RUN_PATH=$(gcin_ld_run_path ) ; \
141
- $(CCLD ) -o $@ $(OBJS_TSLEARN ) -L./im-client -lgcin-im-client $(LDFLAGS )
140
+ $(CCLD ) $(gcc_ld_run_path ) -o $@ $(OBJS_TSLEARN ) -L./im-client -lgcin-im-client $(LDFLAGS )
142
141
143
142
juyin-learn : $(OBJS_JUYIN_LEARN )
144
143
$(CCLD ) -o $@ $(OBJS_JUYIN_LEARN ) $(LDFLAGS )
145
144
rm -f core.*
146
145
sim2trad : $(OBJS_sim2trad )
147
- LD_RUN_PATH=$(gcin_ld_run_path ) \
148
- $(CC ) -o $@ $(OBJS_sim2trad ) $(LDFLAGS )
146
+ $(CC ) $(gcc_ld_run_path ) -o $@ $(OBJS_sim2trad ) $(LDFLAGS )
149
147
rm -f core.*
150
148
trad2sim : sim2trad
151
149
ln -sf sim2trad trad2sim
152
150
153
151
gcin-setup : $(OBJS_gcin_steup ) im-client/libgcin-im-client.so
154
152
rm -f core.*
155
- export LD_RUN_PATH=$(gcin_ld_run_path ) ; \
156
- $(CCLD ) -o $@ $(OBJS_gcin_steup ) -L./im-client -lgcin-im-client $(LDFLAGS )
153
+ $(CCLD ) $(gcc_ld_run_path ) -o $@ $(OBJS_gcin_steup ) -L./im-client -lgcin-im-client $(LDFLAGS )
157
154
158
155
phoa2d : $(OBJS_phoa2d ) im-client/libgcin-im-client.so
159
- export LD_RUN_PATH=$(gcin_ld_run_path ) ; \
160
- $(CCLD ) -o $@ $(OBJS_phoa2d ) -L./im-client -lgcin-im-client $(LDFLAGS )
156
+ $(CCLD ) $(gcc_ld_run_path ) -o $@ $(OBJS_phoa2d ) -L./im-client -lgcin-im-client $(LDFLAGS )
161
157
162
158
phod2a : $(OBJS_phod2a )
163
159
$(CCLD ) -lX11 -o $@ $(OBJS_phod2a ) $(LDFLAGS )
164
160
165
161
tsa2d32 : $(OBJS_tsa2d32 ) im-client/libgcin-im-client.so
166
- export LD_RUN_PATH=$(gcin_ld_run_path ) ; \
167
- $(CCLD ) -o $@ $(OBJS_tsa2d32 ) -L./im-client -lgcin-im-client $(LDFLAGS )
162
+ $(CCLD ) $(gcc_ld_run_path ) -o $@ $(OBJS_tsa2d32 ) -L./im-client -lgcin-im-client $(LDFLAGS )
168
163
169
164
tsd2a : $(OBJS_tsd2a )
170
165
$(CCLD ) -o $@ $(OBJS_tsd2a ) $(LDFLAGS )
@@ -183,20 +178,16 @@ kbmcv: $(OBJS_kbmcv)
183
178
$(CCLD ) -o $@ $(OBJS_kbmcv ) $(LDFLAGS )
184
179
185
180
gcin-gb-toggle : $(OBJS_gcin_gb_toggle )
186
- export LD_RUN_PATH=$(gcin_ld_run_path ) ; \
187
- $(CCLD ) -o $@ $(OBJS_gcin_gb_toggle ) -L./im-client -lgcin-im-client $(LDFLAGS )
181
+ $(CCLD ) $(gcc_ld_run_path ) -o $@ $(OBJS_gcin_gb_toggle ) -L./im-client -lgcin-im-client $(LDFLAGS )
188
182
189
183
gcin-kbm-toggle : $(OBJS_gcin_kbm_toggle )
190
- export LD_RUN_PATH=$(gcin_ld_run_path ) ; \
191
- $(CCLD ) -o $@ $(OBJS_gcin_kbm_toggle ) -L./im-client -lgcin-im-client $(LDFLAGS )
184
+ $(CCLD ) $(gcc_ld_run_path ) -o $@ $(OBJS_gcin_kbm_toggle ) -L./im-client -lgcin-im-client $(LDFLAGS )
192
185
193
186
gcin-exit : $(OBJS_gcin_exit )
194
- export LD_RUN_PATH=$(gcin_ld_run_path ) ; \
195
- $(CCLD ) -o $@ $(OBJS_gcin_exit ) -L./im-client -lgcin-im-client $(LDFLAGS )
187
+ $(CCLD ) $(gcc_ld_run_path ) -o $@ $(OBJS_gcin_exit ) -L./im-client -lgcin-im-client $(LDFLAGS )
196
188
197
189
gcin-message : $(OBJS_gcin_message )
198
- export LD_RUN_PATH=$(gcin_ld_run_path ) ; \
199
- $(CCLD ) -o $@ $(OBJS_gcin_message ) -L./im-client -lgcin-im-client $(LDFLAGS )
190
+ $(CCLD ) $(gcc_ld_run_path ) -o $@ $(OBJS_gcin_message ) -L./im-client -lgcin-im-client $(LDFLAGS )
200
191
201
192
pin-juyin : $(OBJS_pin_juyin )
202
193
$(CCLD ) -o $@ $(OBJS_pin_juyin ) $(LDFLAGS )
0 commit comments