Blob Blame History Raw
diff -urN gcin-1.6.1.pre11.orig/gtk-im/Makefile gcin-1.6.1.pre11/gtk-im/Makefile
--- gcin-1.6.1.pre11.orig/gtk-im/Makefile	2011-02-08 06:51:18.000000000 +0530
+++ gcin-1.6.1.pre11/gtk-im/Makefile	2011-04-25 10:04:35.278369392 +0530
@@ -26,11 +26,11 @@
 
 all:	im-gcin.so im-gcin-cur.so
 
-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.2.3
 	$(CC) $(gcc_ld_run_path) $(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.3
 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
 	rm -f core.*
 
diff -urN gcin-1.6.1.pre11.orig/im-client/Makefile gcin-1.6.1.pre11/im-client/Makefile
--- gcin-1.6.1.pre11.orig/im-client/Makefile	2011-03-24 08:00:20.000000000 +0530
+++ gcin-1.6.1.pre11/im-client/Makefile	2011-04-25 10:04:35.279369396 +0530
@@ -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
diff -urN gcin-1.6.1.pre11.orig/Makefile gcin-1.6.1.pre11/Makefile
--- gcin-1.6.1.pre11.orig/Makefile	2011-04-21 15:46:51.732155224 +0530
+++ gcin-1.6.1.pre11/Makefile	2011-04-25 10:06:15.707697181 +0530
@@ -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 \
@@ -19,7 +19,7 @@
              table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o pho-dbg.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 pho-dbg.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
@@ -120,12 +120,12 @@
 #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path)
 
 gcin:   $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
-	$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
+	$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB) -lanthy
 	rm -f core.* vgcore.*
 	ln -sf $@ $@.test
 
 gcin-nocur:   $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
-	$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
+	$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
 	rm -f core.*
 
 tslearn:        $(OBJS_TSLEARN)
@@ -135,7 +135,7 @@
 	$(CCLD) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
 	rm -f core.*
 sim2trad:        $(OBJS_sim2trad)
-	$(CC) $(gcc_ld_run_path) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
+	$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
 	rm -f core.*
 trad2sim:	sim2trad
 	ln -sf sim2trad trad2sim
@@ -193,20 +193,6 @@
 gcin-version.h:	VERSION.gcin
 	echo '#define GCIN_VERSION "'`cat VERSION.gcin`'"' > gcin-version.h
 
-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 += gcin-module.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)
-
 anthy_module_so = anthy.pico
 anthy-module.so: $(anthy_module_so)
 	$(CCLD) $(SO_FLAGS) -o $@ $(anthy_module_so) $(LDFLAGS) -lanthy
@@ -222,14 +208,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
@@ -268,7 +251,6 @@
 	$(MAKE) -C qt4-im clean
 	$(MAKE) -C man clean
 	$(MAKE) -C menu 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 {} \;