--- gcin-1.2.8/im-client/Makefile.im-client 2006-10-14 13:12:51.000000000 +0800
+++ gcin-1.2.8/im-client/Makefile 2006-10-20 09:48:35.000000000 +0800
@@ -6,7 +6,7 @@
-DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
-DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
-DFREEBSD=$(FREEBSD)
-OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt.o
+OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt-fpic.o
.c.E:
$(CC) $(CFLAGS) -E -o $@ $<
@@ -14,15 +14,16 @@
.c.o:
$(CC) -c -fpic $(CFLAGS) -o $@ $<
-libgcin-im-client.so: $(OBJS)
- $(CC) $(SO_FLAGS) $(OBJS) -o $@
+libgcin-im-client.so.1.0.1: $(OBJS)
+ $(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
+ ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
$(MAKE) -C ../gtk-im
LOCALLIB=/usr/local/$(LIB)
install:
- install -d $(gcinlibdir)
- install -m 755 libgcin-im-client.so $(gcinlibdir)
+ install -d $(libdir)
+ install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
install -d $(includedir); \
install -m 444 gcin-im-client.h $(includedir)
@@ -35,6 +36,9 @@
im-addr.o: ../im-srv/im-addr.c
$(CC) -c -fpic $(CFLAGS) -o $@ $<
+gcin-crypt-fpic.o: gcin-crypt.c
+ $(CC) -c -fpic $(CFLAGS) -o $@ $<
+
clean:
rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
--- gcin-1.2.8/Makefile.im-client 2006-10-19 15:33:27.000000000 +0800
+++ gcin-1.2.8/Makefile 2006-10-20 09:15:50.000000000 +0800
@@ -8,10 +8,11 @@
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
-GCIN_SO= gcin1.so
+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
+#GCIN_SO= gcin1.so
OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
- gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
+ gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
$(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
@@ -70,8 +71,7 @@
if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
gcin: $(OBJS) $(IMdkitLIB) $(im-srv)
- export LD_RUN_PATH=.:$(gcinlibdir) ;\
- $(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
+ $(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
rm -f core.*
ln -sf $@ $@.test
@@ -124,9 +124,9 @@
pin-juyin: $(OBJS_pin_juyin)
$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
-gcin1.so: $(gcin1_so)
- $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+#gcin1.so: $(gcin1_so)
+# $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
### making the following as .so actuall makes the RSS larger
gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
@@ -151,15 +151,12 @@
ibin:
install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
- install $(GCIN_SO) $(gcinlibdir)
install:
install -d $(datadir)/icons
install gcin.png $(datadir)/icons
install -d $(GCIN_ICON_DIR_i)
install -m 644 icons/* $(GCIN_ICON_DIR_i)
- install -d $(gcinlibdir)
- install $(GCIN_SO) $(gcinlibdir)
install -d $(bindir)
$(MAKE) -C data install
$(MAKE) -C im-client install
--- gcin-1.2.8/gtk-im/Makefile.orig 2006-10-14 13:16:16.000000000 +0800
+++ gcin-1.2.8/gtk-im/Makefile 2006-10-20 08:58:46.000000000 +0800
@@ -20,8 +20,7 @@
.c.o:
$(CC) -c -fpic $(CFLAGS) -o $@ $<
-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.0.1
$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
rm -f core.*