1 files changed, 102 insertions, 39 deletions
diff --git a/japanese/FreeWnn-lib/files/patch-ah b/japanese/FreeWnn-lib/files/patch-ah
index fb8ec376e5df..52b33e5af906 100644
--- a/japanese/FreeWnn-lib/files/patch-ah
+++ b/japanese/FreeWnn-lib/files/patch-ah
@@ -1,39 +1,102 @@
---- ./kWnn/etc/Imakefile.orig	Wed Aug 17 10:11:33 1994
-+++ ./kWnn/etc/Imakefile	Sat Jul 19 23:53:01 1997
-@@ -3,4 +3,6 @@
- XCOMM
-+XCOMM For Mule, add sources (yincoding.c py_table.c zy_table.c) 1
-+XCOMM   -- S. Taoka
- #define DoNormalLib YES
- 
- #include <Library.tmpl>
-@@ -19,6 +21,9 @@
- 	xutoj.c \
- 	dic_atojis.c \
- 	msg.c \
-+	yincoding.c \
-+	py_table.c \
-+	zy_table.c \
- 	server_env.c
- 
- OBJS= strings.o \
-@@ -32,6 +37,9 @@
- 	xutoj.o \
- 	dic_atojis.o \
- 	msg.o \
-+	yincoding.o \
-+	py_table.o \
-+	zy_table.o \
- 	server_env.o
- 
- LibraryObjectRule()
-@@ -51,6 +59,9 @@
- LinkSourceFile(xutoj.c,$(WNNETCSRC))
- LinkSourceFile(dic_atojis.c,$(WNNETCSRC))
- LinkSourceFile(msg.c,$(WNNETCSRC))
-+LinkSourceFile(yincoding.c,$(WNNETCSRC))
-+LinkSourceFile(py_table.c,$(WNNETCSRC))
-+LinkSourceFile(zy_table.c,$(WNNETCSRC))
- LinkSourceFile(server_env.c,$(WNNETCSRC))
- 
- DependTarget()
+--- ../Xsi.org/Wnn/jutil/Makefile.in	Sun Jan 30 12:50:59 2000
++++ Wnn/jutil/Makefile.in	Thu Aug 31 10:03:49 2000
+@@ -108,72 +108,76 @@
+ 
+ all:: $(PROGRAMS)
+ 
++clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
++
+ atod: $(OBJATOD)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
+ 
+ clean::
+ 	$(RM) atod
+ 
+ atof: $(OBJATOF)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
+ 
+ clean::
+ 	$(RM) atof
+ 
+ wnntouch: $(OBJTOUCH)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
+ 
+ clean::
+ 	$(RM) wnntouch
+ 
+ dicsort: $(OBJSORT)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
+ 
+ clean::
+ 	$(RM) dicsort
+ 
+ oldatonewa: $(OBJOLDTONEW)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJOLDTONEW) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJOLDTONEW) @LIBS@
+ 
+ clean::
+ 	$(RM) oldatonewa
+ 
+ dtoa: $(OBJDTOA)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
+ 
+ clean::
+ 	$(RM) dtoa
+ 
+-wnnstat: $(OBJSTAT) $(WNNJLIB)
++wnnstat: $(OBJSTAT) @DEPWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(WNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(WNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) wnnstat
+ 
+-wnnkill: $(OBJKILL) $(WNNJLIB)
++wnnkill: $(OBJKILL) @DEPWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(WNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(WNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) wnnkill
+ 
+-wddel: $(OBJWDDEL) $(WNNJLIB)
++wddel: $(OBJWDDEL) @DEPWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(WNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(WNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) wddel
+ 
+-wdreg: $(OBJWDREG) $(WNNJLIB)
++wdreg: $(OBJWDREG) @DEPWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(WNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(WNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) wdreg
+@@ -184,7 +188,7 @@
+ 	@for flag in ${MAKEFLAGS} ''; do \
+ 	case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
+ 	for i in $(PROGRAMS); do \
+-	(set -x; $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(JWNNBINDIR)); \
++	(set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(JWNNBINDIR)); \
+ 	done
+ 
+ $(OBJ1) : $(SRC1)