diff -urN gcin-1.5.0.orig/Makefile gcin-1.5.0/Makefile
--- gcin-1.5.0.orig/Makefile 2010-06-18 17:35:27.000000000 +0800
+++ gcin-1.5.0/Makefile 2010-06-23 09:51:49.000000000 +0800
@@ -8,7 +8,7 @@
gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
gcin_gtab_o = gtab.o win-gtab.o gtab-util.o gtab-list.o gtab-buf.o
-GCIN_SO= gcin1.so gcin2.so
+GCIN_SO= intcode.o win-int.o win-message.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o anthy.o
OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o cache.o gtk_bug_fix.o \
@@ -19,7 +19,7 @@
table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o
OBJS_JUYIN_LEARN=juyin-learn.o locale.o util.o pho-util.o pho-sym.o \
gcin-settings.o gcin-conf.o table-update.o pinyin.o gcin-icon.o
-OBJS_sim2trad=sim2trad.o util.o gcin2.so locale.o gcin-conf.o gcin-icon.o
+OBJS_sim2trad=sim2trad.o util.o t2s-lookup.o locale.o gcin-conf.o gcin-icon.o
OBJS_phod2a=phod2a.o pho-util.o gcin-conf.o pho-sym.o table-update.o pho-dbg.o locale.o \
gcin-settings.o util.o
OBJS_tsa2d32=tsa2d32.o gcin-send.o util.o pho-sym.o gcin-conf.o locale.o pho-lookup.o
@@ -125,14 +125,13 @@
if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im; fi
gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
- LD_RUN_PATH=$(gcin_ld_run_path) \
- $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
+ $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
rm -f core.* vgcore.*
ln -sf $@ $@.test
gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
LD_RUN_PATH=$(gcinlibdir) \
- $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
+ $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
rm -f core.*
tslearn: $(OBJS_TSLEARN)
@@ -143,7 +142,6 @@
$(CCLD) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
rm -f core.*
sim2trad: $(OBJS_sim2trad)
- LD_RUN_PATH=$(gcin_ld_run_path) \
$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
rm -f core.*
trad2sim: sim2trad
@@ -202,20 +200,6 @@
im-client/libgcin-im-client.so:
$(MAKE) -C im-client
-gcin1_so += intcode.pico win-int.pico win-message.pico win-sym.pico \
-win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico
-
-ifeq ($(USE_ANTHY),Y)
-gcin1_so += anthy.pico
-endif
-
-gcin1.so: $(gcin1_so) pho.o tsin.o eve.o gtab.o win-sym.o
- $(CCLD) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-
-gcin2_so= t2s-lookup.pico
-gcin2.so: $(gcin2_so) gcin-conf.o
- $(CCLD) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)
-
#gtk_bug_fix.so: gtk_bug_fix.pico
# $(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
@@ -239,14 +223,11 @@
install $(PROGS) $(bindir); \
cp gcin-nocur $(bindir)/gcin; \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
- install $(GCIN_SO) $(gcinlibdir)
install:
install -d $(datadir)/icons
install -m 644 gcin.png $(datadir)/icons
$(MAKE) -C icons install
- install -d $(gcinlibdir)
- install $(GCIN_SO) $(gcinlibdir)
install -d $(bindir)
$(MAKE) -C data install
$(MAKE) -C im-client install
@@ -256,13 +237,9 @@
if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
if [ $(prefix) = /usr/local ]; then \
install -m 644 gcin.png /usr/share/icons; \
- install -d $(DOC_DIR); \
- install -m 644 README.html Changelog.html $(DOC_DIR); \
install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
else \
- install -d $(DOC_DIR_i); \
- install -m 644 README.html Changelog.html $(DOC_DIR_i); \
install -s $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
fi
@@ -285,7 +262,7 @@
$(MAKE) -C qt4-im clean
$(MAKE) -C man clean
$(MAKE) -C menu clean
- $(MAKE) -C po clean
+ #$(MAKE) -C po clean
rm -f *.o *.E *.db *.pico *.so config.mak tags $(PROGS) gcin-nocur $(PROGS_CV) \
$(DATA) .depend gcin.spec trad2sim gcin.spec.tmp gcin.log
find . '(' -name '.ted*' -o -name '*~' -o -name 'core.*' -o -name 'vgcore.*' ')' -exec rm {} \;
diff -urN gcin-1.5.0.orig/gtk-im/Makefile gcin-1.5.0/gtk-im/Makefile
--- gcin-1.5.0.orig/gtk-im/Makefile 2010-06-06 00:50:00.000000000 +0800
+++ gcin-1.5.0/gtk-im/Makefile 2010-06-23 09:58:17.000000000 +0800
@@ -26,12 +26,11 @@
all: im-gcin.so im-gcin-cur.so
-im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so
- export LD_RUN_PATH=$(gcinlibdir) ;\
+im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so.1.2.1
$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
rm -f core.*
-im-gcin-cur.so: $(OBJS) ../im-client/libgcin-im-client.so
+im-gcin-cur.so: $(OBJS) ../im-client/libgcin-im-client.so.1.2.1
$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
rm -f core.*
diff -urN gcin-1.5.0.orig/im-client/Makefile gcin-1.5.0/im-client/Makefile
--- gcin-1.5.0.orig/im-client/Makefile 2009-12-12 19:28:49.000000000 +0800
+++ gcin-1.5.0/im-client/Makefile 2010-06-23 10:00:10.000000000 +0800
@@ -28,9 +28,9 @@
LOCALLIB=/usr/local/$(LIB)
install:
- install -d $(gcinlibdir)
- install -m 755 $(SOFILEVER) $(gcinlibdir)
- cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ install -d $(libdir)
+ install -m 755 $(SOFILEVER) $(libdir)
+ cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
ln -sf $(SOFILEVER) $(SOFILE).1
gcin-conf.o: ../gcin-conf.cpp