(1) {chinese,korean,japanese}/Wnn (Wnn 4.2) was updated as follows:

  (a) Its name was changed from Wnn to FreeWnn because Wnn6 which is a
      commercial software exits
  (b) Its license was changed to GPL.
  (c) The method to configure was changed from imake to GNU configure.
  (d) Relatively to the original Wnn, the Wnn in the ports tree were
      modified by me a lot. Most of the modifications were adopted
      into FreeWnn.
  (c) Header and library files are installed into
      ${LOCALBASE}/{lib,include} instead of ${X11BASE}/{lib,include}.

(2) FreeWnn is divided into two ports FreeWnn-lib and FreeWnn-server
in chinese, korean and japanese categories. The former is for libwnn
and header files to compile client commands, and the files used in
client commands.  The latter is for a server to convert KANA to KANJI
(Chinese character), and dictionaries and files used by the server.

Notice: I forgot to commit FreeWnn-{lib,server} (^_^;;

25 files changed, 1128 insertions, 648 deletions

diff --git a/japanese/FreeWnn-lib/files/patch-aa b/japanese/FreeWnn-lib/files/patch-aa
new file mode 100644
index 000000000000..3ed5d77c97d4
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-aa
@@ -0,0 +1,188 @@
+--- configure.in.orig	Fri Mar 17 01:15:32 2000
++++ configure.in	Fri Sep  1 01:13:50 2000
+@@ -48,7 +48,185 @@
+ esac
+ AC_SUBST(abs_top_srcdir)
+ 
++dnl ====================================================================
++dnl Check optional features
++dnl ====================================================================
+ 
++AM_PROG_LIBTOOL
++
++AC_ARG_ENABLE(sharedlib,
++[  --enable-sharedlib      build shared library using GNU libtool],
++ [if test "$enableval" = yes
++  then
++    use_sharedlib=yes
++  else
++    use_sharedlib=no
++  fi], [use_sharedlib=default])
++
++
++dnl build and install libraries or server
++
++AC_ARG_ENABLE(libraries,
++[  --enable-libraries         build and install libraries [default=yes]],
++[case "${enableval}" in
++   yes) libraries=true ;;
++   no)  libraries=false ;;
++   *)   AC_MSG_ERROR(bad value for --enable-libraries) ;;
++esac], libraries=true)
++
++AC_ARG_ENABLE(server,
++[  --enable-server         build and install server [default=yes]],
++[case "${enableval}" in
++   yes) server=true ;;
++   no)  server=false ;;
++   *)   AC_MSG_ERROR(bad value for --enable-server) ;;
++esac], server=true)
++
++
++if test $libraries = true; then
++	SUBDIRS="\$(LIB_SUBDIRS)"
++	WNNMANDIR="\$(LIB_WNNMANDIR)"
++fi
++if test $server = true; then
++	SUBDIRS="$SUBDIRS \$(SERVER_SUBDIRS)"
++	WNNMANDIR="$WNNMANDIR \$(SERVER_WNNMANDIR)"
++fi
++
++AC_SUBST(SUBDIRS)
++AC_SUBST(WNNMANDIR)
++
++dnl For Severs
++
++AC_ARG_ENABLE(Wnn,
++[  --enable-Wnn         build and install Wnn [default=true]],
++[case "${enableval}" in
++   yes) Wnn="Wnn";;
++   no)  Wnn="" ;;
++   *)   AC_MSG_ERROR(bad value for --enable-Wnn) ;;
++esac], Wnn="Wnn")
++AC_SUBST(Wnn)
++
++if test "$server" = true -a "$Wnn" = Wnn; then
++	JSERVER_SUBDIRS1="\$(JSERVER_SUBDIRS1)"
++	JSERVER_SUBDIRS2="\$(JSERVER_SUBDIRS2)"
++else
++	JSERVER_SUBDIRS1=""
++	JSERVER_SUBDIRS2=""
++fi
++AC_SUBST(JSERVER_SUBDIRS1)
++AC_SUBST(JSERVER_SUBDIRS2)
++
++AC_ARG_ENABLE(cWnn,
++[  --enable-cWnn         build and install cWnn [default=true]],
++[case "${enableval}" in
++   yes) cWnn="cWnn" ;;
++   no)  cWnn="" ;;
++   *)   AC_MSG_ERROR(bad value for --enable-cWnn) ;;
++esac], cWnn="cWnn")
++AC_SUBST(cWnn)
++
++AC_ARG_ENABLE(kWnn,
++[  --enable-kWnn         build and install kWnn [default=true]],
++[case "${enableval}" in
++   yes) kWnn="kWnn" ;;
++   no)  kWnn="" ;;
++   *)   AC_MSG_ERROR(bad value for --enable-kWnn) ;;
++esac], kWnn="kWnn")
++AC_SUBST(kWnn)
++
++dnl For a library libwnn
++
++dnl AC_ARG_WITH(libwnn,
++dnl [  --with-libwnn               use installed Wnn library [default=no]],
++dnl [case "${withval}" in
++dnl    yes|no) with_libwnn=${withval};;
++dnl    *)   AC_MSG_ERROR(invalid argument to --with-libwnn) ;;
++dnl esac], with_libwnn=no)
++dnl 
++
++AC_ARG_WITH(libwnn,
++[  --with-libwnn               use installed Wnn library [default=no]],
++[  with_libwnn="${withval}"
++AC_ARG_WITH(wnn-includes,
++[  --with-wnn-includes=DIR  WNN include files are in DIR],
++[wnnincludedir="-I${withval}"], [wnnincludedir=''])
++AC_ARG_WITH(wnn-libraries,
++[  --with-wnn-libraries=DIR Search for WNN libraries in DIR[default=/usr/local/lib]],
++[wnnlibdir="${withval}"], [wnnlibdir='/usr/local/lib'])
++	if test "X${with_libwnn}" = X-lwnn; then
++		WNNJLIB="-L${wnnlibdir} -lwnn"
++	elif test X"`echo ${with_libwnn} | grep '^/.*'`" != X ; then
++		WNNJLIB="${with_libwnn}"
++	else
++		WNNJLIB="${wnnlibdir}/libwnn.a"
++	fi
++	DEPWNNJLIB=""
++	HINSI_DATA="\$(JWNNWNNDIR)/hinsi.data"
++],
++[	WNNJLIB="\$(WNNJLIBSRC)/libwnn.la"
++	DEPWNNJLIB="\$(WNNJLIB)"
++	HINSI_DATA="\$(WNNJDSRC)/hinsi.data"
++])
++AC_SUBST(WNNJLIB)
++AC_SUBST(DEPWNNJLIB)
++AC_SUBST(HINSI_DATA)
++
++AC_ARG_WITH(libcwnn,
++[  --with-libcwnn               use installed cWnn library [default=no]],
++[
++AC_ARG_WITH(cwnn-includes,
++[  --with-cwnn-includes=DIR  CWNN include files are in DIR],
++[cwnnincludedir="-I${withval}"], [cwnnincludedir=''])
++AC_ARG_WITH(cwnn-libraries,
++[  --with-cwnn-libraries=DIR Search for CWNN libraries in DIR[default=/usr/local/lib]],
++[cwnnlibdir="${withval}"], [cwnnlibdir='/usr/local/lib'])
++	if test "X${with_libcwnn}" = X-lcwnn; then
++		CWNNJLIB="-L${cwnnlibdir} -lcwnn"
++	elif test X"`echo ${with_libcwnn} | grep '^/.*'`" != X ; then
++		CWNNJLIB="${with_libcwnn}"
++	else
++		CWNNJLIB="${cwnnlibdir}/libcwnn.a"
++	fi
++	DEPCWNNJLIB=""
++	CHINSI_DATA="\$(CWNNWNNDIR)/cixing.data"
++	THINSI_DATA="\$(TWNNTDSRC)/cixing.data"
++],
++[	CWNNJLIB="\$(CWNNJLIBSRC)/libcwnn.la"
++	DEPCWNNJLIB="\$(CWNNJLIB)"
++	CHINSI_DATA="\$(CWNNCDSRC)/cixing.data"
++	THINSI_DATA="\$(TWNNTDSRC)/cixing.data"
++])
++AC_SUBST(CWNNJLIB)
++AC_SUBST(DEPCWNNJLIB)
++AC_SUBST(CHINSI_DATA)
++AC_SUBST(THINSI_DATA)
++
++AC_ARG_WITH(libkwnn,
++[  --with-libkwnn               use installed kWnn library [default=no]],
++[
++AC_ARG_WITH(kwnn-includes,
++[  --with-kwnn-includes=DIR  KWNN include files are in DIR],
++[kwnnincludedir="-I${withval}"], [kwnnincludedir=''])
++AC_ARG_WITH(kwnn-libraries,
++[  --with-kwnn-libraries=DIR Search for KWNN libraries in DIR[default=/usr/local/lib]],
++[kwnnlibdir="${withval}"], [kwnnlibdir='/usr/local/lib'])
++	if test "X${with_libkwnn}" = X-lkwnn; then
++		KWNNJLIB="-L${kwnnlibdir} -lkwnn"
++	elif test X"`echo ${with_libkwnn} | grep '^/.*'`" != X ; then
++		KWNNJLIB="${with_libkwnn}"
++	else
++		KWNNJLIB="${kwnnlibdir}/libkwnn.a"
++	fi
++	DEPKWNNJLIB=""
++	KHINSI_DATA="\$(KWNNWNNDIR)/hinsi.data"
++],
++[	KWNNJLIB="\$(KWNNJLIBSRC)/libkwnn.la"
++	DEPKWNNJLIB="\$(KWNNJLIB)"
++	KHINSI_DATA="\$(KWNNKDSRC)/hinsi.data"
++])
++AC_SUBST(KWNNJLIB)
++AC_SUBST(DEPKWNNJLIB)
++AC_SUBST(KHINSI_DATA)
+ 
+ dnl
+ dnl Checks for cc and cpp.
diff --git a/japanese/FreeWnn-lib/files/patch-ab b/japanese/FreeWnn-lib/files/patch-ab
index c811c85af5e8..30db318a07f9 100644
--- a/japanese/FreeWnn-lib/files/patch-ab
+++ b/japanese/FreeWnn-lib/files/patch-ab
@@ -1,64 +1,29 @@
---- Wnn/jserver/de.c~	Fri Aug 19 10:31:23 1994
-+++ Wnn/jserver/de.c	Fri Mar 10 00:44:42 2000
-@@ -65,6 +65,9 @@
+--- Makefile.in.orig	Tue Feb  1 22:18:59 2000
++++ Makefile.in	Tue Aug 29 14:32:22 2000
+@@ -31,13 +31,22 @@
  
- #include <sys/ioctl.h>
+ include @top_srcdir@/makerule.mk
  
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
- #ifdef SYSVR2
- #include <sys/param.h>
- #ifndef SIGCHLD
-@@ -264,7 +267,16 @@
- 	fclose(stdin);
- 	fclose(stdout);
- 	if(!noisy){
-+#if !(defined(BSD) && (BSD >= 199306)) /* !4.4BSD-Lite by Taoka */
- 	    fclose(stderr);
-+#else /* 4.4BSD-Lite */
-+	    int fd = open("/dev/null", O_WRONLY);
-+	    if (fd < 0) {
-+		xerror("Cannot open /dev/null\n");
-+	    }
-+	    dup2(fd, 2);
-+	    close(fd);
-+#endif /* 4.4BSD-Lite */
- 	}
+-WNNDIR = Wnn
++WNNDIR = @Wnn@
  
- #if defined(hpux) || defined(SOLARIS)
-@@ -542,10 +554,14 @@
+-CWNNDIR = cWnn
++CWNNDIR = @cWnn@
  
- /**	**/
- void
--gets_cur(cp)
-+gets_cur(cp, len)
- register char *cp;
-+int len;
- {
--    while((*cp++ = getc_cur()) != '\0');
-+    int i;
-+
-+    for (i = 0; i < len; i++)
-+	if ((*(cp + i) = getc_cur()) == '\0') break;
- }
+-KWNNDIR = kWnn
++KWNNDIR = @kWnn@
  
- /**	**/
-@@ -648,6 +664,17 @@
- {
-     register int c;
-     while(c= *p++) putc_cur(c);
-+    putc_cur(0);
-+}
+-SUBDIRS= PubdicPlus $(WNNDIR) Contrib/dic/gerodic $(CWNNDIR) $(KWNNDIR) 
++LIB_SUBDIRS =  
++SEVER_SUBDIRS =	
++
++# PubdicPlusとContrib/dic/gerodicをSERVER_SUBDIRSにまとめいところだが、
++# SUBDIRSの処理順をうまくしないとWnn/pubdicplusのmakeに失敗するので仕方
++# ない
++JSERVER_SUBDIRS1 = PubdicPlus
++JSERVER_SUBDIRS2 = Contrib/dic/gerodic
 +
-+/**	**/
-+void
-+puts_n_cur(p,n)
-+char *p;
-+int n;
-+{
-+    register int c;
-+    while((c = *p++) && --n >= 0) putc_cur(c);
-     putc_cur(0);
- }
++SUBDIRS= @JSERVER_SUBDIRS1@ $(WNNDIR) @JSERVER_SUBDIRS2@ $(CWNNDIR) $(KWNNDIR) @SUBDIRS@
  
+ World::
+ 	@echo ""
diff --git a/japanese/FreeWnn-lib/files/patch-ac b/japanese/FreeWnn-lib/files/patch-ac
new file mode 100644
index 000000000000..1ff09596b5a4
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ac
@@ -0,0 +1,15 @@
+--- Wnn/Makefile.in.orig	Sun Jan 30 13:32:01 2000
++++ Wnn/Makefile.in	Mon Aug 28 02:12:51 2000
+@@ -53,7 +53,11 @@
+ 
+ JLIBV3DIR = jlib.V3
+ 
+-SUBDIRS = $(JDDIR) $(JSERVERDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR)         $(PUBDICPLUSDIR) $(WNNCONSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
++LIB_SUBDIRS =  $(JDDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
++
++SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(PUBDICPLUSDIR) $(WNNCONSDIR) $(WNNMANDIR)
++
++SUBDIRS = @SUBDIRS@
+ 
+ install::
+ 	@for flag in ${MAKEFLAGS} ''; do \
diff --git a/japanese/FreeWnn-lib/files/patch-ad b/japanese/FreeWnn-lib/files/patch-ad
new file mode 100644
index 000000000000..36309e2d5793
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ad
@@ -0,0 +1,17 @@
+--- cWnn/Makefile.in.orig	Sun Jan 30 15:47:47 2000
++++ cWnn/Makefile.in	Tue Aug 29 13:48:56 2000
+@@ -51,7 +51,13 @@
+ 
+ WNNMANDIR = man
+ 
+-SUBDIRS = $(JLIBDIR) $(CDDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) 	$(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR) $(TDDIR)
++LIB_SUBDIRS = $(JLIBDIR) $(CDDIR) $(WNNCLIENTSDIR) $(TDDIR)
++
++SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR)
++
++SUBDIRS = @SUBDIRS@
++
++ALL_SUBDIRS = $(LIB_SUBDIRS) $(SERVER_SUBDIRS)
+ 
+ install::
+ 	@for flag in ${MAKEFLAGS} ''; do \
diff --git a/japanese/FreeWnn-lib/files/patch-ae b/japanese/FreeWnn-lib/files/patch-ae
index 7ea048b9903a..8e0e5584551c 100644
--- a/japanese/FreeWnn-lib/files/patch-ae
+++ b/japanese/FreeWnn-lib/files/patch-ae
@@ -1,14 +1,25 @@
---- ./Contrib/dic/gerodic/Makefile.orig	Sun Jun 27 00:09:13 1993
-+++ ./Contrib/dic/gerodic/Makefile	Tue Jul 29 12:06:28 1997
-@@ -4,8 +4,9 @@
- #	Jun. 26th '93 Wnn Consortium
- #
+--- kWnn/Makefile.in.orig	Tue Feb  1 23:12:42 2000
++++ kWnn/Makefile.in	Fri Sep  1 02:54:36 2000
+@@ -39,13 +39,19 @@
  
--WNNBINDIR=/usr/local/bin/Wnn4
--WNNWNNDIR=/usr/local/lib/wnn
-+PREFIX = /usr/local
-+WNNBINDIR=${PREFIX}/bin/Wnn4
-+WNNWNNDIR=${PREFIX}/lib/wnn
+ WNNCLIENTSDIR = conv
  
- WNNOWNER=wnn
+-JLIBDIR = romkan jlib
++JLIBDIR = include etc romkan jlib
  
+ KDICDIR = kdic
+ 
+-KDDIR = include kd
++KDDIR = kd
+ 
+-SUBDIRS = $(KDDIR) etc $(JLIBDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) 	$(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR)
++LIB_SUBDIRS = $(KDDIR) $(JLIBDIR) $(WNNCLIENTSDIR)
++
++SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR)
++
++SUBDIRS = @SUBDIRS@
++
++ALL_SUBDIRS = $(LIB_SUBDIRS) $(SERVER_SUBDIRS)
+ 
+ install::
+ 	@for flag in ${MAKEFLAGS} ''; do \
diff --git a/japanese/FreeWnn-lib/files/patch-af b/japanese/FreeWnn-lib/files/patch-af
index 577c5210fb5f..d94fbdc19573 100644
--- a/japanese/FreeWnn-lib/files/patch-af
+++ b/japanese/FreeWnn-lib/files/patch-af
@@ -1,45 +1,13 @@
---- Wnn/jutil/wnnstat.c.orig	Tue Jul 29 01:21:32 1997
-+++ Wnn/jutil/wnnstat.c	Tue Jul 29 01:41:42 1997
-@@ -69,7 +69,7 @@
- #define W_DIC_ALL 5
- #define W_VERSION 6
+--- Wnn/man/Makefile.in.~1~	Sun Jan 30 14:36:27 2000
++++ Wnn/man/Makefile.in	Mon Aug 28 02:13:36 2000
+@@ -31,5 +31,9 @@
  
--#ifdef JAPANSE
-+#ifdef JAPANESE
- extern  int eujis_to_jis8(), eujis_to_sjis();
- #endif
- #ifdef CHINESE
-@@ -129,13 +129,13 @@
- 	strcpy(lang, WNN_DEFAULT_LANG);
+ include @top_srcdir@/makerule.mk
+ 
+-SUBDIRS = 2.env 3.libwnn 4.cmd 6.jutil
++LIB_WNNMANDIR = 3.libwnn
++
++SERVER_WNNMANDIR = 2.env 4.cmd 6.jutil
++
++SUBDIRS = @WNNMANDIR@
  
- #ifdef JAPANESE
--    while ((c = getopt(argc,argv,"EewdDfFUSJVL:K")) != EOF) {
-+    while ((c = getopt(argc,argv,"weEdDfFUSJVL:")) != EOF) {
- #endif
- #ifdef  CHINESE
--    while ((c = getopt(argc,argv,"EewdDfFUBCVL:K")) != EOF) {
-+    while ((c = getopt(argc,argv,"weEdDfFUBCVL:")) != EOF) {
- #endif
- # ifdef KOREAN
--    while ((c = getopt(argc,argv,"EewdDfFUVL:K")) != EOF) {
-+    while ((c = getopt(argc,argv,"weEdDfFUKVL:")) != EOF) {
- #endif
- 	switch(c){
- 	case 'w':
-@@ -317,13 +317,13 @@
- usage()
- {
- #ifdef JAPANESE
--    fprintf(stderr, "wnnstat [-weEdDfFKSUJ] [-L lang_name] [server_name]\n");
-+    fprintf(stderr, "wnnstat [-weEdDfFUSJV] [-L lang_name] [server_name]\n");
- #endif	/* JAPANESE */
- #ifdef	CHINESE
--    fprintf(stderr, "wnnstat [-weEdDfFSUJBC] [-L lang_name] [server_name]\n");
-+    fprintf(stderr, "cwnnstat [-weEdDfFUBCV] [-L lang_name] [server_name]\n");
- #endif	/* CHINESE */
- #ifdef KOREAN
--    fprintf(stderr, "kwnnstat [-weEdDfFKU] [-L lang_name] [server_name]\n");
-+    fprintf(stderr, "kwnnstat [-weEdDfFUKV] [-L lang_name] [server_name]\n");
- #endif	/* KOREAN */
-     exit(-1);
- }
diff --git a/japanese/FreeWnn-lib/files/patch-ag b/japanese/FreeWnn-lib/files/patch-ag
index d11ee32a427b..ea8f84ae47df 100644
--- a/japanese/FreeWnn-lib/files/patch-ag
+++ b/japanese/FreeWnn-lib/files/patch-ag
@@ -1,11 +1,79 @@
---- ./kWnn/kd/uumrc.orig	Tue Jun 28 11:29:51 1994
-+++ ./kWnn/kd/uumrc	Sat Jul 19 02:48:17 1997
-@@ -8,7 +8,7 @@
- setconvenv	@LIBDIR/@LANG/wnnenvrc
- setkankanaenv	@LIBDIR/@LANG/wnnenvrc_R
+--- makerule.mk.in.orig	Sun Feb 13 18:15:54 2000
++++ makerule.mk.in	Fri Sep  1 01:18:47 2000
+@@ -39,6 +39,8 @@
+            DEPEND = gccmakedep
+         MKDIRHIER = mkdir -p
  
--setjishopath    @LIBDIR/@LANG/dic/pubdic/
-+setjishopath    @LIBDIR/@LANG/dic/sys/
- sethindopath    @LIBDIR/@LANG/dic/usr/@USR/
++# for libtool (AM_PROG_LIBTOOL)
++     top_builddir = @abs_top_srcdir@
+ 
+            MANDIR = @mandir@/man$(MANSUFFIX)
+         LIBMANDIR = @mandir@/man$(LIBMANSUFFIX)
+@@ -68,6 +70,8 @@
+            RANLIB = @RANLIB@
+   RANLIBINSTFLAGS =
+ 
++          LIBTOOL = @LIBTOOL@
++
+                RM = rm -f
+               TBL = tbl
+ 
+@@ -145,7 +149,8 @@
+    WNNCNVFILEDIR = $(WNNJDSRC)/./bsd
+     WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC)
+      WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
+-        WNNJLIB = $(WNNJLIBSRC)/libwnn.a
++        WNNJLIB = @WNNJLIB@
++ WNNJLIBVERSION = 0:0
+      WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a
+ 
+         CWNNTOP = $(IMTOP)/cWnn
+@@ -168,7 +173,8 @@
+  CWNNCNVFILEDIR = $(CWNNCDSRC)/./bsd
+    CWNNINCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANMSRC)
+     CWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
+-       CWNNJLIB = $(CWNNJLIBSRC)/libcwnn.a
++       CWNNJLIB = @CWNNJLIB@
++CWNNJLIBVERSION = 0:0
+     CWNNCONVLIB = $(CWNNCONVSRC)/libconvkey.a
+ 
+         KWNNTOP = $(IMTOP)/kWnn
+@@ -191,7 +197,8 @@
+  KWNNCNVFILEDIR = $(KWNNCDSRC)/./bsd
+    KWNNINCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANMSRC)
+     KWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
+-       KWNNJLIB = $(KWNNJLIBSRC)/libkwnn.a
++       KWNNJLIB = @KWNNJLIB@
++KWNNJLIBVERSION = 0:0
+     KWNNCONVLIB = $(KWNNCONVSRC)/libconvkey.a
+ 
+        TWNNLANG = zh_TW
+@@ -245,6 +252,19 @@
+ 	|| if [ $$cont -eq 0 ]; then exit 1; fi; \
+ 	done
+ 
++includes::
++	@cont=0; \
++	for flag in ${MAKEFLAGS} ''; do \
++	case "$$flag" in *=*) ;; *[ik]*) cont=1;; esac; done; \
++	SUBDIRS="$(ALL_SUBDIRS)" ;\
++	for i in $$SUBDIRS ;\
++	do \
++	echo "making" all "in $(CURRENT_DIR)/$$i..."; \
++	(cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \
++	'CDEBUGFLAGS=$(CDEBUGFLAGS)' includes) \
++	|| if [ $$cont -eq 0 ]; then exit 1; fi; \
++	done
++
+ install::
+ 	@cont=0; \
+ 	for flag in ${MAKEFLAGS} ''; do \
+@@ -328,8 +348,6 @@
+ 	@echo "install.linkkit in $(CURRENT_DIR) done"
+ 
+ Makefiles::
+-
+-includes::
+ 
+ depend::
  
- setuumkey	@LIBDIR/@LANG/uumkey
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)
diff --git a/japanese/FreeWnn-lib/files/patch-ai b/japanese/FreeWnn-lib/files/patch-ai
index 87fae7aaadb3..f4f2dd8de246 100644
--- a/japanese/FreeWnn-lib/files/patch-ai
+++ b/japanese/FreeWnn-lib/files/patch-ai
@@ -1,105 +1,94 @@
---- kWnn/jlib/Imakefile.orig	Wed Aug 17 10:11:40 1994
-+++ kWnn/jlib/Imakefile	Tue Jan  5 23:06:15 1999
-@@ -3,5 +3,9 @@
- XCOMM
-+XCOMM For Mule, add sources (yincoding.c py_table.c zy_table.c) 1
-+XCOMM   -- S. Taoka
-+XCOMM
- #define DoNormalLib YES
-+#define DoSharedLib YES
- 
- #include <Library.tmpl>
- 
-@@ -10,7 +14,9 @@
- LINKS = getopt.c jl.c js.c wnnerrmsg.c
-     JLIBDEFINES = -DWRITE_CHECK
-        INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP)
--        DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) $(JLIBDEFINES)
-+        DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) $(CWNNLANGDEF) $(JLIBDEFINES)
-+XCOMM						# for Mule
-+XCOMM						#   -- S. Taoka
-    INSTALLFLAGS = $(INSTBINFLAGS)
-        LINTLIBS = 
- 
-@@ -28,6 +34,15 @@
- OBJ4= strings.o
- SRC5= $(KWNNETCSRC)/bcopy.c
- OBJ5= bcopy.o
-+SRC6= $(KWNNETCSRC)/yincoding.c
-+XCOMM for Mule
-+XCOMM   -- S. Taoka
-+OBJ6= yincoding.o
-+SRC7= $(KWNNETCSRC)/py_table.c
-+OBJ7= py_table.o
-+SRC8= $(KWNNETCSRC)/zy_table.c
-+OBJ8= zy_table.o
-+
- LOCAL_RKSRCS= $(KWNNROMKANSRC)/rk_bltinfn.c \
- 	$(KWNNROMKANSRC)/rk_main.c \
- 	$(KWNNROMKANSRC)/rk_modread.c \
-@@ -40,13 +55,26 @@
- 	$(KWNNROMKANSRC)/rk_read.o \
- 	$(KWNNROMKANSRC)/rk_vars.o
- 
--LOCAL_ETCSRCS = $(SRC4) $(SRC5)
--LOCAL_ETCOBJS = $(OBJ4) $(OBJ5)
-+UNSHARED_LOCAL_RKOBJS= $(KWNNROMKANSRC)/unshared/rk_bltinfn.o \
-+	$(KWNNROMKANSRC)/unshared/rk_main.o \
-+	$(KWNNROMKANSRC)/unshared/rk_modread.o \
-+	$(KWNNROMKANSRC)/unshared/rk_read.o \
-+	$(KWNNROMKANSRC)/unshared/rk_vars.o
-+
-+LOCAL_ETCSRCS = $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8)
-+LOCAL_ETCOBJS = $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8)
- SRCS= $(SRC1) $(SRC3) $(LOCAL_ETCSRCS)
- OBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS)
-+UNSHAREDOBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS)
+--- ../Xsi.org/cWnn/jutil/Makefile.in	Sun Jan 30 14:54:49 2000
++++ cWnn/jutil/Makefile.in	Thu Aug 31 10:07:33 2000
+@@ -108,65 +108,69 @@
+ 
+ all:: $(PROGRAMS)
+ 
++clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
 +
-+SOKWNN4LIBREV=1.0
+ catod: $(OBJATOD)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
  
- LibraryObjectRule()
-+#if DoSharedLib
-+AllTarget($(OBJS) libkwnn.a libkwnn4.so.$(SOKWNN4LIBREV))
-+#else
- AllTarget($(OBJS) libkwnn.a)
-+#endif
+ clean::
+ 	$(RM) catod
  
- includes:: $(LINKS)
+ catof: $(OBJATOF)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
  
-@@ -65,11 +93,19 @@
+ clean::
+ 	$(RM) catof
  
- NormalLintTarget($(SRC2))
+ cwnntouch: $(OBJTOUCH)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
  
--NormalLibraryTarget(kwnn,$(OBJS))
-+#if DoSharedLib
-+SharedLibraryTarget(kwnn4,$(SOKWNN4LIBREV),$(OBJS),.,.)
-+#endif
-+
-+UnsharedLibraryTarget(kwnn,$(UNSHAREDOBJS),unshared,..)
- LintLibraryTarget(kwnn,$(SRCS))
+ clean::
+ 	$(RM) cwnntouch
  
- instlib:: install
+ cdicsort: $(OBJSORT)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
  
-+#if DoSharedLib
-+InstallSharedLibrary(kwnn4,$(SOKWNN4LIBREV),$(WNNLIBDIR))
-+#endif
-+
- InstallLibrary(kwnn,$(WNNLIBDIR))
- 
- #if ProfileLibJlib
-@@ -77,9 +113,12 @@
- InstallLibrary(kwnn_p,$(WNNLIBDIR))
- #endif
- 
--WnnSpecialObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),)
--WnnSpecialObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),)
--WnnSpecialObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),)
-+WnnSpecialSharedObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),)
-+WnnSpecialSharedObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),)
-+WnnSpecialSharedObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),)
-+WnnSpecialSharedObjectRule($(OBJ6),$(SRC6),$(KWNNETCSRC),)
-+WnnSpecialSharedObjectRule($(OBJ7),$(SRC7),$(KWNNETCSRC),)
-+WnnSpecialSharedObjectRule($(OBJ8),$(SRC8),$(KWNNETCSRC),)
- 
- $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
- 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+ clean::
+ 	$(RM) cdicsort
+ 
+ cdtoa: $(OBJDTOA)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
+ 
+ clean::
+ 	$(RM) cdtoa
+ 
+-cwnnstat: $(OBJSTAT) $(CWNNJLIB)
++cwnnstat: $(OBJSTAT) @DEPCWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(CWNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(CWNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) cwnnstat
+ 
+-cwnnkill: $(OBJKILL) $(CWNNJLIB)
++cwnnkill: $(OBJKILL) @DEPCWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(CWNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(CWNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) cwnnkill
+ 
+-cwddel: $(OBJWDDEL) $(CWNNJLIB)
++cwddel: $(OBJWDDEL) @DEPCWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(CWNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(CWNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) cwddel
+ 
+-cwdreg: $(OBJWDREG) $(CWNNJLIB)
++cwdreg: $(OBJWDREG) @DEPCWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(CWNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(CWNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) cwdreg
+@@ -324,7 +328,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)$(CWNNBINDIR)); \
++	(set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(CWNNBINDIR)); \
+ 	done
+ 
+ $(OBJ1) : $(SRC1)
diff --git a/japanese/FreeWnn-lib/files/patch-aj b/japanese/FreeWnn-lib/files/patch-aj
index 53e082d82d66..ffae7afdfd44 100644
--- a/japanese/FreeWnn-lib/files/patch-aj
+++ b/japanese/FreeWnn-lib/files/patch-aj
@@ -1,28 +1,94 @@
---- ./Wnn/jlib.V3/Imakefile.orig	Wed Aug 17 10:10:13 1994
-+++ ./Wnn/jlib.V3/Imakefile	Fri Aug  1 14:11:09 1997
-@@ -19,6 +19,10 @@
- OBJ3= sstrings.o
- SRCS= $(SRC1) $(SRC2) $(SRC3)
- OBJS= $(OBJ1) $(OBJ2) $(OBJ3)
-+SRC4= $(WNNETCSRC)/xutoj.c
-+OBJ4= xutoj.o
-+SRCS= $(SRC1) $(SRC2) $(SRC3) $(SRC4)
-+OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4)
- 
- LibraryObjectRule()
- 
-@@ -31,7 +35,7 @@
- 
- LintLibraryTarget(jd,$(SRCS))
- InstallLibrary(jd,$(WNNLIBDIR))
--InstallNonExecFile($(WNNINCLUDESRC)/jlib.h,$(JWNNINCDIR))
-+InstallNonExecFile(jlib.h,$(JWNNINCDIR))
- 
- #if DebugLibJd
- DebuggedLibraryTarget(jd,$(OBJS))
-@@ -42,4 +46,5 @@
- 
- WnnSpecialObjectRule($(OBJ2),$(SRC2),$(WNNETCSRC),)
- WnnSpecialObjectRule($(OBJ3),$(SRC3),$(WNNETCSRC),)
-+WnnSpecialObjectRule($(OBJ4),$(SRC4),$(WNNETCSRC),)
- DependTarget()
+--- ../Xsi.org/kWnn/jutil/Makefile.in	Sun Jan 30 16:02:26 2000
++++ kWnn/jutil/Makefile.in	Thu Aug 31 10:10:02 2000
+@@ -105,65 +105,69 @@
+ 
+ all:: $(PROGRAMS)
+ 
++clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
++
+ katod: $(OBJATOD)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@
+ 
+ clean::
+ 	$(RM) katod
+ 
+ katof: $(OBJATOF)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@
+ 
+ clean::
+ 	$(RM) katof
+ 
+ kwnntouch: $(OBJTOUCH)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@
+ 
+ clean::
+ 	$(RM) kwnntouch
+ 
+ kdicsort: $(OBJSORT)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT)
+ 
+ clean::
+ 	$(RM) kdicsort
+ 
+ kdtoa: $(OBJDTOA)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJDTOA) @LIBS@
+ 
+ clean::
+ 	$(RM) kdtoa
+ 
+-kwnnstat: $(OBJSTAT) $(KWNNJLIB)
++kwnnstat: $(OBJSTAT) @DEPKWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(KWNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSTAT) $(KWNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) kwnnstat
+ 
+-kwnnkill: $(OBJKILL) $(KWNNJLIB)
++kwnnkill: $(OBJKILL) @DEPKWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(KWNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJKILL) $(KWNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) kwnnkill
+ 
+-kwddel: $(OBJWDDEL) $(KWNNJLIB)
++kwddel: $(OBJWDDEL) @DEPKWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(KWNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDDEL) $(KWNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) kwddel
+ 
+-kwdreg: $(OBJWDREG) $(KWNNJLIB)
++kwdreg: $(OBJWDREG) @DEPKWNNJLIB@
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(KWNNJLIB) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJWDREG) $(KWNNJLIB) @LIBS@
+ 
+ clean::
+ 	$(RM) kwdreg
+@@ -321,7 +325,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)$(KWNNBINDIR)); \
++	(set -x; $(LIBTOOL) $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(KWNNBINDIR)); \
+ 	done
+ 
+ $(OBJ1) : $(SRC1)
diff --git a/japanese/FreeWnn-lib/files/patch-ak b/japanese/FreeWnn-lib/files/patch-ak
index 407a45f207c7..10c85c559fba 100644
--- a/japanese/FreeWnn-lib/files/patch-ak
+++ b/japanese/FreeWnn-lib/files/patch-ak
@@ -1,160 +1,11 @@
---- Wnn/uum/jhlp.c.orig	Thu Mar  9 16:34:56 2000
-+++ Wnn/uum/jhlp.c	Thu Mar  9 16:44:26 2000
-@@ -80,6 +80,9 @@
- 
- jmp_buf kk_env;
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
- #ifdef SYSVR2
- #	include <sys/param.h>
- #endif /* SYSVR2 */
-@@ -168,12 +171,14 @@
- 
-     strcpy(username, getpwuid(getuid())->pw_name);
-     if((name = getenv(WNN_USERNAME_ENV)) != NULL){
--	strcpy(username, name);
-+	strncpy(username, name, PATHNAMELEN - 1);
-+	username[PATHNAMELEN - 1] = '\0';
-     }
-     for (i = 1; i < argc;) {
- 	if (!strcmp(argv[i++], "-L")) {
- 	    if (i >= argc || argv[i][0] == '-') default_usage();
--	    strcpy(lang_dir, argv[i++]);
-+	    strncpy(lang_dir, argv[i++], 31);
-+	    lang_dir[31] = '\0';
- 	    for (;i < argc; i++) {
- 		argv[i - 2] = argv[i];
- 	    }
-@@ -233,8 +238,9 @@
- 	    server_env = WNN_DEF_SERVER_ENV;
- 	}
- 	if(name = getenv(server_env)) {
--	    strcpy(def_servername, name);
--	    strcpy(def_reverse_servername, name);
-+	    strncpy(def_servername, name, PATHNAMELEN - 1);
-+	    def_servername[PATHNAMELEN - 1] = '\0';
-+	    strcpy(def_reverse_servername, def_servername);
- 	}
-     }
- 
-@@ -263,9 +269,11 @@
- 
- 
- #if defined(BSD42) && !defined(DGUX)
-+#if !(defined(BSD) && (BSD >= 199306))
-     if (saveutmp() < 0) {
- 	puts("Can't save utmp\n");
-     }
-+#endif
- #endif /* BSD42 */
- 
- 
-@@ -492,7 +500,8 @@
- 
- static int do_k_opt()
- {
--    strcpy(uumkey_name_in_uumrc, optarg);
-+    strncpy(uumkey_name_in_uumrc, optarg, PATHNAMELEN - 1);
-+    uumkey_name_in_uumrc[PATHNAMELEN - 1] = '\0';
-     if (*uumkey_name_in_uumrc == '\0') {
- 	return -1;
-     }
-@@ -502,7 +511,8 @@
- 
- static int do_c_opt()
- {
--    strcpy(convkey_name_in_uumrc, optarg);
-+    strncpy(convkey_name_in_uumrc, optarg, PATHNAMELEN - 1);
-+    convkey_name_in_uumrc[PATHNAMELEN - 1] = '\0';
-     if (*convkey_name_in_uumrc == '\0') {
- 	return -1;
-     }
-@@ -512,7 +522,8 @@
- 
- static int do_r_opt()
- {
--    strcpy(rkfile_name_in_uumrc, optarg);
-+    strncpy(rkfile_name_in_uumrc, optarg, PATHNAMELEN - 1);
-+    rkfile_name_in_uumrc[PATHNAMELEN - 1] = '\0';
-     if (*rkfile_name_in_uumrc == '\0') {
- 	return -1;
-     }
-@@ -528,8 +539,9 @@
- 
- static int do_D_opt()
- {
--    strcpy(def_servername, optarg);
--    strcpy(def_reverse_servername, optarg);
-+    strncpy(def_servername, optarg, PATHNAMELEN - 1);
-+    def_servername[PATHNAMELEN - 1] = '\0';
-+    strcpy(def_reverse_servername, def_servername);
-     if (*def_servername == '\0') {
- 	return -1;
-     }
-@@ -538,7 +550,8 @@
- 
- static int do_n_opt()
- {
--    strcpy(username, optarg);
-+    strncpy(username, optarg, PATHNAMELEN - 1);
-+    username[PATHNAMELEN - 1] = '\0';
-     if (*username == '\0') {
- 	return -1;
-     }
-@@ -771,7 +784,12 @@
- #endif
-     int pid;
- 
--    if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) {
-+/*
-+ * Remove warning.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+ */
-+/*  if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { */
-+    if ((pid = wait3((int *)&status, WNOHANG | WUNTRACED, NULL)) == child_id) {
- 	if (WIFSTOPPED(status)) {
- #ifdef SIGCONT
- 	    kill(pid, SIGCONT);
-@@ -1140,9 +1158,11 @@
- 	setpgrp(0, pid);
- #endif /* BSD42 */
- 
-+#if !(defined(BSD) && (BSD >= 199306))
- 	if (setutmp(ttypfd) == ERROR) {
- 	    puts("Can't set utmp.");
- 	} 
-+#endif
- 
- #ifdef linux
- 	setsid();
-@@ -1562,9 +1582,11 @@
- 	perror(prog);
-     }
- 
-+#if !(defined(BSD) && (BSD >= 199306))
-     if (resetutmp(ttypfd) == ERROR) {
- 	printf("Can't reset utmp.");
-     }
-+#endif
- #ifdef TIOCSSIZE
-     pty_rowcol.ts_lines = 0;
-     pty_rowcol.ts_cols = 0;
-@@ -1636,7 +1658,16 @@
- char *b, *pty;
- int no;
- {
-+/*
-+ * Change pseudo-devices.
-+ * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v].
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+ */
-+#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */
-+    sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f));
-+#else /* ! 4.4BSD-Lite */
-     sprintf(b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f);
-+#endif /* ! 4.4BSD-Lite */
- }
- #endif /* !sgi */
+--- Wnn/wnncons/dic/Makefile.in.~1~	Sun Jan 30 12:47:39 2000
++++ Wnn/wnncons/dic/Makefile.in	Tue Aug 29 09:19:40 2000
+@@ -36,7 +36,7 @@
+    INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER)
+            ATOD = $(WNNJUTILSRC)/atod
+        WNNTOUCH = $(WNNJUTILSRC)/wnntouch
+-          HINSI = $(WNNJDSRC)/hinsi.data
++          HINSI = @HINSI_DATA@
+ 
+ LINKS = tankan2.u tankan3.u
  
diff --git a/japanese/FreeWnn-lib/files/patch-al b/japanese/FreeWnn-lib/files/patch-al
index d4423556f7af..cf45f9e59562 100644
--- a/japanese/FreeWnn-lib/files/patch-al
+++ b/japanese/FreeWnn-lib/files/patch-al
@@ -1,20 +1,11 @@
---- ./Wnn/jlib.V3/jlib.h.orig	Tue Sep 17 06:30:30 1991
-+++ ./Wnn/jlib.V3/jlib.h	Fri Sep  5 21:37:24 1997
-@@ -51,12 +51,14 @@
- /*
- 	Nihongo	Henkan	Library Header File
- */
--/*
- #include <setjmp.h>
--*/
--
- 
- #define	w_char	unsigned short
-+#ifndef WCHAR_T
-+#define wchar_t	w_char
-+#define wchar	w_char
-+#define WCHAR_T
-+#endif 
- 
- #define JLIB
+--- Wnn/pubdicplus/Makefile.in.~1~	Sun Jan 30 12:49:35 2000
++++ Wnn/pubdicplus/Makefile.in	Tue Aug 29 09:25:58 2000
+@@ -37,7 +37,7 @@
+            ATOD = $(WNNJUTILSRC)/atod
+            ATOF = $(WNNJUTILSRC)/atof
+        WNNTOUCH = $(WNNJUTILSRC)/wnntouch
+-          HINSI = $(WNNJDSRC)/hinsi.data
++          HINSI = @HINSI_DATA@
+        FZK_FLAG =
  
+ LINKS = Version bio.hd bio.u chimei.hd chimei.u computer.hd  computer.u fzk.attr fzk.con fzk.fzkattr fzk.jirattr  fzk.jircon fzk.master fzk.shuutan jinmei.hd jinmei.u  kihon.hd kihon.u koyuu.hd koyuu.u setsuji.hd setsuji.u  special.hd special.u symbol.hd symbol.u tankan.hd tankan.u
diff --git a/japanese/FreeWnn-lib/files/patch-am b/japanese/FreeWnn-lib/files/patch-am
new file mode 100644
index 000000000000..62819bda9ca8
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-am
@@ -0,0 +1,11 @@
+--- cWnn/cdic/Makefile.in.~1~	Sun Sep 12 23:01:35 1999
++++ cWnn/cdic/Makefile.in	Tue Aug 29 09:31:05 2000
+@@ -30,7 +30,7 @@
+         ATOD = $(CWNNJUTILSRC)/catod
+         ATOF = $(CWNNJUTILSRC)/catof
+     WNNTOUCH = $(CWNNJUTILSRC)/cwnntouch
+-       HINSI = $(CWNNCDSRC)/cixing.data
++       HINSI = @CHINSI_DATA@
+ #       HINSI = ./cixing.data
+     FZK_FLAG =
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-an b/japanese/FreeWnn-lib/files/patch-an
index 3d1848c7f010..d8948ce74626 100644
--- a/japanese/FreeWnn-lib/files/patch-an
+++ b/japanese/FreeWnn-lib/files/patch-an
@@ -1,55 +1,11 @@
---- Xwnmo/xwnmo/client.c.~1~	Mon Aug 23 11:06:16 1993
-+++ Xwnmo/xwnmo/client.c	Fri Feb  6 06:44:03 1998
-@@ -53,7 +53,7 @@
- {
-     char *p;
-     char ret = '\0';
--    extern char *index();
-+/*    extern char *index();*/
- 
-     if ((p = romkan_dispmode()) == NULL) return(ret);
-     if ((p = (char*)index(p, ':')) == NULL) return(ret);
---- Xwnmo/xwnmo/screen.c.~1~	Tue Dec  1 15:10:57 1992
-+++ Xwnmo/xwnmo/screen.c	Fri Feb  6 06:48:15 1998
-@@ -361,7 +361,7 @@
- get_rk_modes()
- {
-     char        *p;
--    extern char *index();
-+/*    extern char *index();*/
- 
-     strcpy(rk_modes, (NULL == (p = romkan_dispmode()) ? "[   ]" : p));
-     if ((p = (char*)index(rk_modes, ':')) != NULL && *(p + 1)) {
---- Xwnmo/xwnmo/jhlp.c.~1~	Thu Aug  4 16:10:14 1994
-+++ Xwnmo/xwnmo/jhlp.c	Fri Feb  6 06:50:24 1998
-@@ -415,7 +415,7 @@
-     XLCd xlc;
- #endif /* X11R5 */
-     extern char *get_server_env();
--    extern char *index();
-+/*    extern char *index(); */
- 
-     prgname = argv[0];
-     if (create_arg_string(argv, argc) == -1) exit(1);
---- Xwnmo/xjutil/init_w.c.~1~	Thu Aug  4 16:10:10 1994
-+++ Xwnmo/xjutil/init_w.c	Fri Feb  6 07:54:48 1998
-@@ -76,7 +76,7 @@
-     char *p;
-     char ret = '\0';
- #ifndef SYSVR2
--    extern char *index();
-+/*    extern char *index(); */
- #else
-     extern char *strchr();
- #endif
---- Xwnmo/xjutil/kensaku.c.~1~	Tue Dec  1 14:59:48 1992
-+++ Xwnmo/xjutil/kensaku.c	Fri Feb  6 07:58:54 1998
-@@ -154,7 +154,7 @@
-     static char message4[2048];
-     int ret;
-     char *table_t[6];
--    extern int qsort();
-+/*    extern int qsort();*/
- 
-     if (get_env() == -1) return(NULL);
+--- cWnn/tdic/Makefile.in.~1~	Sun Sep 12 23:01:35 1999
++++ cWnn/tdic/Makefile.in	Tue Aug 29 09:32:37 2000
+@@ -30,7 +30,7 @@
+         ATOD = $(CWNNJUTILSRC)/catod
+         ATOF = $(CWNNJUTILSRC)/catof
+     WNNTOUCH = $(CWNNJUTILSRC)/cwnntouch
+-       HINSI = $(TWNNTDSRC)/cixing.data
++       HINSI = @THINSI_DATA@
+ #       HINSI = ./cixing.data
+     FZK_FLAG =
  
diff --git a/japanese/FreeWnn-lib/files/patch-ao b/japanese/FreeWnn-lib/files/patch-ao
index c3aa020ff065..04195d764537 100644
--- a/japanese/FreeWnn-lib/files/patch-ao
+++ b/japanese/FreeWnn-lib/files/patch-ao
@@ -1,81 +1,11 @@
-diff -ru Wnn.org/jd/jserverrc Wnn/jd/jserverrc
---- Wnn.org/jd/jserverrc	Mon Sep  6 10:47:31 1993
-+++ Wnn/jd/jserverrc	Tue Feb 10 07:58:43 1998
-@@ -20,7 +20,9 @@
- ;readfile wnncons/tankan3.dic
- 
- ;         n nbun hindo len jiri flag jisho sbn dbn_len sbn_cnt suji kana eisuu kigou toji fuzoku kai
--def_param 2 10   2     40  100  200  20    1   40      -40     40   -100 40    80    40   100    40
-+;def_param 2 10   2     40  100  200  20    1   40      -40     40   -100 40    80    40   100    40
-+; New Parameter
-+def_param 2 10   2     45  100  200  5     1   40      -100    200  -100 200   80    200  200    200
- 
- ;set_giji_eisuu '-' '_' 0x20 \x5c ^M '変' 1234 012 \o12
- set_giji_eisuu '-' '_' 0x20 '―' '＿' '￣' '!' '?' '.' ',' ':' ';' '：' '；' '？' '！' '，' '．' '・'
-diff -ru Wnn.org/jd/wnnenvrc.omr Wnn/jd/wnnenvrc.omr
---- Wnn.org/jd/wnnenvrc.omr	Mon Sep  6 10:47:34 1993
-+++ Wnn/jd/wnnenvrc.omr	Tue Feb 10 07:58:56 1998
-@@ -19,4 +19,7 @@
- ;setdic wnncons/tankan3.dic	-			1 1 1 - - 0
- 
- ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
--setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
-+;setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
-+; New Parameter
-+setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
-+
-diff -ru Wnn.org/jd/wnnenvrc.rem Wnn/jd/wnnenvrc.rem
---- Wnn.org/jd/wnnenvrc.rem	Mon Sep  6 10:47:36 1993
-+++ Wnn/jd/wnnenvrc.rem	Tue Feb 10 07:59:06 1998
-@@ -19,4 +19,6 @@
- ;setdic wnncons/tankan3.dic -  1 1 1 - - 0
- 
- ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
--setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
-+;setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
-+; New Parameter
-+setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
-diff -ru Wnn.org/jd/wnnenvrc.rev Wnn/jd/wnnenvrc.rev
---- Wnn.org/jd/wnnenvrc.rev	Mon Sep  6 10:47:37 1993
-+++ Wnn/jd/wnnenvrc.rev	Tue Feb 10 07:59:15 1998
-@@ -19,4 +19,6 @@
- ;setdic wnncons/tankan3.dic !@WNN_DIC_DIR/wnncons/tankan3.frq  1 1 1 - - 0
- 
- ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
--setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
-+;setparam 2 10   2     40  100  200  20    1   40      -40     40    -100 40    80    40         100      40
-+; New Parameter
-+setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
-diff -ru Wnn.org/jd/wnnenvrc_R.omr Wnn/jd/wnnenvrc_R.omr
---- Wnn.org/jd/wnnenvrc_R.omr	Wed Aug 25 15:11:40 1993
-+++ Wnn/jd/wnnenvrc_R.omr	Tue Feb 10 07:59:24 1998
-@@ -19,4 +19,6 @@
- ;setdic wnncons/tankan3.dic	-			1 1 1 - - 1
- 
- ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
--setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
-+;setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
-+; New Parameter
-+setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
-diff -ru Wnn.org/jd/wnnenvrc_R.rem Wnn/jd/wnnenvrc_R.rem
---- Wnn.org/jd/wnnenvrc_R.rem	Wed Aug 25 15:11:48 1993
-+++ Wnn/jd/wnnenvrc_R.rem	Tue Feb 10 07:59:34 1998
-@@ -19,4 +19,6 @@
- ;setdic wnncons/tankan3.dic -  1 1 1 - - 1
- 
- ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
--setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
-+;setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
-+; New Parameter
-+setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
-diff -ru Wnn.org/jd/wnnenvrc_R.rev Wnn/jd/wnnenvrc_R.rev
---- Wnn.org/jd/wnnenvrc_R.rev	Wed Aug 25 15:11:54 1993
-+++ Wnn/jd/wnnenvrc_R.rev	Tue Feb 10 07:59:42 1998
-@@ -19,4 +19,6 @@
- ;setdic wnncons/tankan3.dic -  1 1 1 - - 1
- 
- ;;       N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko
--setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
-+;setparam 2 10   2     45  1    80   5     1   50      -20     400   -10  100   -100  200        0        200
-+; New Parameter
-+setparam 2 10   2     45  100  200  5     1   40      -100    200   -100 200   80    200        200      200
+--- kWnn/kdic/Makefile.in.~1~	Sun Sep 12 23:01:35 1999
++++ kWnn/kdic/Makefile.in	Tue Aug 29 09:34:33 2000
+@@ -29,7 +29,7 @@
+         ATOD = $(KWNNJUTILSRC)/katod
+         ATOF = $(KWNNJUTILSRC)/katof
+     WNNTOUCH = $(KWNNJUTILSRC)/kwnntouch
+-       HINSI = $(KWNNKDSRC)/hinsi.data
++       HINSI = @KHINSI_DATA@
+     FZK_FLAG =
+ 
+    INSTALLFLAGS = -m 644 -o $(WNNOWNER)
diff --git a/japanese/FreeWnn-lib/files/patch-ap b/japanese/FreeWnn-lib/files/patch-ap
index 17495e11a56e..0add98f308f1 100644
--- a/japanese/FreeWnn-lib/files/patch-ap
+++ b/japanese/FreeWnn-lib/files/patch-ap
@@ -1,25 +1,82 @@
---- Imakefile.~1~	Tue Oct  4 08:18:46 1994
-+++ Imakefile	Tue Feb 10 11:29:58 1998
-@@ -4,7 +4,7 @@
- #define IHaveSubdirs
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
- 
--#if BuildWnn || BuildXwnmo
-+#if BuildWnn
- WNNDIR = Wnn
- #endif
- #if BuildCWnn
---- ./Xwnmo/jd/ximconf.~1~	Thu Feb 12 10:20:17 1998
-+++ ./Xwnmo/jd/ximconf	Thu Feb 12 10:32:59 1998
-@@ -18,8 +18,8 @@
- 		zh_TW	zh_TW.ucns	2,1,2	True	Yincoding
- zh_CN.eucCN|zh_CN.ugb	\
- 		zh_CN	zh_CN.ugb	2,1,2	True	Yincoding
--ja|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \
--		ja_JP	ja_JP.ujis	2,1,2	True	Normal
-+ja|ja_JP.EUC|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \
-+		ja_JP	ja_JP.EUC	2,1,2	True	Normal
- 
--setdefaultlocale	ja_JP.ujis
-+setdefaultlocale	ja_JP.EUC
- setworldlocale	wr_WR.ct
+--- Wnn/jlib/Makefile.in.orig	Tue Mar 21 01:21:11 2000
++++ Wnn/jlib/Makefile.in	Fri Sep  1 01:25:52 2000
+@@ -81,11 +81,13 @@
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+ clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+-all:: $(OBJS) libwnn.a
++all:: $(OBJS) libwnn.la
+ 
+ all:: libgetopt.a
+ 
+@@ -109,17 +111,15 @@
+ 
+ kankana: kankana.o
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB)
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB)
+ 
+ clean::
+ 	$(RM) kankana
+ 
+-all:: libwnn.a
++all:: libwnn.la
+ 
+-libwnn.a: $(OBJS) $(EXTRALIBRARYDEPS)
+-	$(RM) $@
+-	$(AR) $@ $(OBJS)
+-	$(RANLIB) $@
++libwnn.la: $(OBJS) $(EXTRALIBRARYDEPS)
++	$(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
+ 
+ lintlib:: llib-lwnn.ln
+ 
+@@ -129,32 +129,31 @@
+ 
+ instlib:: install
+ 
+-install:: libwnn.a
++install:: libwnn.la
+ 	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libwnn.a $(DESTDIR)$(WNNLIBDIR)
+-	$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libwnn.a
++	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libwnn.la $(DESTDIR)$(WNNLIBDIR)
+ 
+ $(OBJ3) : $(SRC3)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ4) : $(SRC4)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ5) : $(SRC5)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ6) : $(SRC6)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ7) : $(SRC7)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ8) : $(SRC8)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ9) : $(SRC9)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
+ 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; 	cd $(WNNROMKANSRC); echo "making all in $(WNNROMKANSRC)"; 	$(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS)
diff --git a/japanese/FreeWnn-lib/files/patch-aq b/japanese/FreeWnn-lib/files/patch-aq
index d476242347bd..c50f5ac01581 100644
--- a/japanese/FreeWnn-lib/files/patch-aq
+++ b/japanese/FreeWnn-lib/files/patch-aq
@@ -1,26 +1,80 @@
---- Xwnmo/xwnmo/localalloc.c.~1~	Tue Dec  1 15:10:40 1992
-+++ Xwnmo/xwnmo/localalloc.c	Thu Jun 25 12:11:29 1998
-@@ -112,6 +112,7 @@
- {
-     char *ptr;
-     if (size == 0) return(NULL);
-+    size += (sizeof(char *)-(size%sizeof(char *)));
-     if ((ptr = malloc(size)) == NULL) {
- #ifdef ALLOC_DEBUG
- 	print_out1("alloc failed with size = %d", size);
-@@ -134,6 +135,7 @@
- unsigned size;
- {
-     if (size == 0) return(ptr);
-+    size += (sizeof(char *)-(size%sizeof(char *)));
-     if (ptr == NULL) return(Malloc(size));
- #ifdef ALLOC_DEBUG
-     unregister_debug(ptr);
-@@ -153,6 +155,7 @@
- {
-     char *ptr;
-     if (size == 0) return(NULL);
-+    size += (sizeof(char *)-(size%sizeof(char *)));
-     if ((ptr = calloc(num, size)) == NULL) {
- 	return(NULL);
-     }
+--- Wnn/jlib.V3/Makefile.in.orig	Fri Jan 21 01:00:28 2000
++++ Wnn/jlib.V3/Makefile.in	Fri Sep  1 10:21:03 2000
+@@ -51,8 +51,24 @@
+ OBJ3= sstrings.o
+ SRC4= $(WNNETCSRC)/xutoj.c
+ OBJ4= xutoj.o
++LOCAL_RKSRCS= $(WNNROMKANSRC)/rk_bltinfn.c 	$(WNNROMKANSRC)/rk_main.c 	$(WNNROMKANSRC)/rk_modread.c 	$(WNNROMKANSRC)/rk_read.c 	$(WNNROMKANSRC)/rk_vars.c
++
++LOCAL_RKOBJS= $(WNNROMKANSRC)/rk_bltinfn.o 	$(WNNROMKANSRC)/rk_main.o 	$(WNNROMKANSRC)/rk_modread.o 	$(WNNROMKANSRC)/rk_read.o 	$(WNNROMKANSRC)/rk_vars.o
++
++LOCAL_ETCSRCS= $(WNNETCSRC)/msg.c $(WNNETCSRC)/yincoding.c $(WNNETCSRC)/py_table.c $(WNNETCSRC)/zy_table.c $(WNNETCSRC)/strings.c $(WNNETCSRC)/bcopy.c $(WNNETCSRC)/mkdir.c
++
++LOCAL_ETCOBJS= $(WNNJLIBSRC)/msg.o $(WNNJLIBSRC)/yincoding.o $(WNNJLIBSRC)/py_table.o $(WNNJLIBSRC)/zy_table.o $(WNNJLIBSRC)/strings.o $(WNNJLIBSRC)/bcopy.o $(WNNJLIBSRC)/mkdir.o
++
++LOCAL_JLIBSRCS= $(WNNJLIBSRC)/js.c $(WNNJLIBSRC)/wnnerrmsg.c $(WNNJLIBSRC)/jl.c $(WNNJLIBSRC)/getopt.c
++
++LOCAL_JLIBOBJS= $(WNNJLIBSRC)/js.o $(WNNJLIBSRC)/wnnerrmsg.o $(WNNJLIBSRC)/jl.o $(WNNJLIBSRC)/getopt.o
++
+ SRCS= $(SRC1) $(SRC2) $(SRC3) $(SRC4)
+-OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4)
++OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS) $(LOCAL_JLIBOBJS)
++
++clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+ all::
+ 
+@@ -60,16 +76,12 @@
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+-
+-clean::
++	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+-all:: libjd.a
++all:: libjd.la
+ 
+-libjd.a: $(OBJS) $(WNNJLIB)
+-	cp $(WNNJLIB) $@
+-	ar rv $@ $(OBJS)
+-	$(RANLIB) $@
++libjd.la: $(OBJS) $(EXTRALIBRARYDEPS)
++	$(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
+ 
+ lintlib:: llib-ljd.ln
+ 
+@@ -77,11 +89,10 @@
+ 	$(RM) $@
+ 	$(LINT) $(LINTLIBFLAG)jd $(LINTFLAGS) $(SRCS)
+ 
+-install:: libjd.a
++install:: libjd.la
+ 	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libjd.a $(DESTDIR)$(WNNLIBDIR)
+-	$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libjd.a
++	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR)
+ 
+ install:: jlib.h
+ 	@if [ -d $(DESTDIR)$(JWNNINCDIR) ]; then set +x; \
+@@ -104,13 +115,13 @@
+ 	done
+ 
+ $(OBJ2) : $(SRC2)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ3) : $(SRC3)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ4) : $(SRC4)
+-	$(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(WNNETCSRC)/`basename $@ .o`.c
+ 
+ depend:: .depend
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-ar b/japanese/FreeWnn-lib/files/patch-ar
new file mode 100644
index 000000000000..3943159ae669
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ar
@@ -0,0 +1,24 @@
+--- ../Xsi.org/Wnn/jserver/Makefile.in	Tue Mar 21 02:34:04 2000
++++ Wnn/jserver/Makefile.in	Thu Aug 31 09:54:43 2000
+@@ -83,17 +83,19 @@
+ 
+ jserver: $(OBJS)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) @LIBS@
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) @LIBS@
+ 
+ clean::
+ 	$(RM) jserver
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+ instserver:: install
+ 
+ install:: jserver
+ 	@if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver
++	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver
+ 
+ $(OBJ0) : $(SRC0)
+ 	$(CC) -c $(CFLAGS) $(SERVERINITDEF) $(FORKDEF) $(SOLINGERDEFS) ./`basename $@ .o`.c
diff --git a/japanese/FreeWnn-lib/files/patch-as b/japanese/FreeWnn-lib/files/patch-as
new file mode 100644
index 000000000000..2a45ab3125a1
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-as
@@ -0,0 +1,15 @@
+--- ../Xsi.org/Wnn/romkan/Makefile.in	Sun Jan 30 12:48:51 2000
++++ Wnn/romkan/Makefile.in	Thu Aug 31 09:54:43 2000
+@@ -51,9 +51,11 @@
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+ clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+ all:: $(OBJS)
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-at b/japanese/FreeWnn-lib/files/patch-at
new file mode 100644
index 000000000000..b274daf263d9
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-at
@@ -0,0 +1,82 @@
+--- cWnn/jlib/Makefile.in.orig	Tue Mar 21 01:21:12 2000
++++ cWnn/jlib/Makefile.in	Fri Sep  1 01:30:47 2000
+@@ -82,11 +82,13 @@
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+ clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+-all:: $(LINKS) $(OBJS) libcwnn.a
++all:: $(LINKS) $(OBJS) libcwnn.la
+ 
+ includes:: $(LINKS)
+ 
+@@ -167,17 +169,15 @@
+ 
+ kankana: kankana.o
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(CWNNJLIB)
++	$(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(CWNNJLIB)
+ 
+ clean::
+ 	$(RM) kankana
+ 
+-all:: libcwnn.a
++all:: libcwnn.la
+ 
+-libcwnn.a: $(OBJS) $(EXTRALIBRARYDEPS)
+-	$(RM) $@
+-	$(AR) $@ $(OBJS)
+-	$(RANLIB) $@
++libcwnn.la: $(OBJS) $(EXTRALIBRARYDEPS)
++	$(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(CWNNJLIBVERSION)
+ 
+ lintlib:: llib-lcwnn.ln
+ 
+@@ -187,32 +187,31 @@
+ 
+ instlib:: install
+ 
+-install:: libcwnn.a
++install:: libcwnn.la
+ 	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libcwnn.a $(DESTDIR)$(WNNLIBDIR)
+-	$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libcwnn.a
++	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libcwnn.la $(DESTDIR)$(WNNLIBDIR)
+ 
+ $(OBJ3) : $(SRC3)
+-	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ4) : $(SRC4)
+-	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ5) : $(SRC5)
+-	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ6) : $(SRC6)
+-	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ7) : $(SRC7)
+-	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ8) : $(SRC8)
+-	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ9) : $(SRC9)
+-	$(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(CWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
+ 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; 	cd $(CWNNROMKANSRC); echo "making all in $(CWNNROMKANSRC)"; 	$(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS)
diff --git a/japanese/FreeWnn-lib/files/patch-au b/japanese/FreeWnn-lib/files/patch-au
new file mode 100644
index 000000000000..d3524772ab70
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-au
@@ -0,0 +1,34 @@
+--- ../Xsi.org/cWnn/jserver/Makefile.in	Tue Mar 21 01:21:12 2000
++++ cWnn/jserver/Makefile.in	Thu Aug 31 09:54:43 2000
+@@ -102,6 +102,8 @@
+ 
+ clean::
+ 	$(RM) cserver
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+ tserver: $(TOBJS)
+ 	$(RM) $@
+@@ -109,18 +111,20 @@
+ 
+ clean::
+ 	$(RM) tserver
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+ instserver:: install
+ 
+ install:: cserver
+ 	@if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) cserver $(DESTDIR)$(CWNNBINDIR)/cserver
++	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) cserver $(DESTDIR)$(CWNNBINDIR)/cserver
+ 
+ install:: tserver
+ 	@if [ -d $(DESTDIR)$(CWNNBINDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(CWNNBINDIR)); fi
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) tserver $(DESTDIR)$(CWNNBINDIR)/tserver
++	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) tserver $(DESTDIR)$(CWNNBINDIR)/tserver
+ 
+ includes:: $(HDRS) $(SRC0) $(SRC1) $(TSRCS)
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-av b/japanese/FreeWnn-lib/files/patch-av
new file mode 100644
index 000000000000..777118e448b6
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-av
@@ -0,0 +1,15 @@
+--- ../Xsi.org/cWnn/romkan/Makefile.in	Sun Jan 30 14:53:39 2000
++++ cWnn/romkan/Makefile.in	Thu Aug 31 09:54:43 2000
+@@ -53,9 +53,11 @@
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+ clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+ all:: $(HDRS) $(SRCS) $(OBJS)
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-aw b/japanese/FreeWnn-lib/files/patch-aw
new file mode 100644
index 000000000000..40f477a9f6cc
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-aw
@@ -0,0 +1,76 @@
+--- kWnn/jlib/Makefile.in.orig	Tue Mar 21 01:21:12 2000
++++ kWnn/jlib/Makefile.in	Fri Sep  1 01:32:41 2000
+@@ -86,11 +86,13 @@
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+ clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+-all:: $(LINKS) $(OBJS) libkwnn.a
++all:: $(LINKS) $(OBJS) libkwnn.la
+ 
+ includes:: $(LINKS)
+ 
+@@ -158,12 +160,10 @@
+ lint1:
+ 	$(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
+ 
+-all:: libkwnn.a
++all:: libkwnn.la
+ 
+-libkwnn.a: $(OBJS) $(EXTRALIBRARYDEPS)
+-	$(RM) $@
+-	$(AR) $@ $(OBJS)
+-	$(RANLIB) $@
++libkwnn.la: $(OBJS) $(EXTRALIBRARYDEPS)
++	$(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(DESTDIR)$(WNNLIBDIR) -version-info $(KWNNJLIBVERSION)
+ 
+ lintlib:: llib-lkwnn.ln
+ 
+@@ -173,32 +173,31 @@
+ 
+ instlib:: install
+ 
+-install:: libkwnn.a
++install:: libkwnn.la
+ 	@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libkwnn.a $(DESTDIR)$(WNNLIBDIR)
+-	$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(WNNLIBDIR)/libkwnn.a
++	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libkwnn.la $(DESTDIR)$(WNNLIBDIR)
+ 
+ $(OBJ3) : $(SRC3)
+-	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ4) : $(SRC4)
+-	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ5) : $(SRC5)
+-	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ6) : $(SRC6)
+-	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ7) : $(SRC7)
+-	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ8) : $(SRC8)
+-	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(OBJ9) : $(SRC9)
+-	$(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS)  $(KWNNETCSRC)/`basename $@ .o`.c
+ 
+ $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS)
+ 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; 	cd $(KWNNROMKANSRC); echo "making all in $(KWNNROMKANSRC)"; 	$(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS)
diff --git a/japanese/FreeWnn-lib/files/patch-ax b/japanese/FreeWnn-lib/files/patch-ax
new file mode 100644
index 000000000000..179c77bc4bfb
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ax
@@ -0,0 +1,19 @@
+--- ../Xsi.org/kWnn/jserver/Makefile.in	Tue Mar 21 01:21:12 2000
++++ kWnn/jserver/Makefile.in	Thu Aug 31 09:54:43 2000
+@@ -90,13 +90,15 @@
+ 
+ clean::
+ 	$(RM) kserver
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+ instserver:: install
+ 
+ install:: kserver
+ 	@if [ -d $(DESTDIR)$(KWNNBINDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(KWNNBINDIR)); fi
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kserver $(DESTDIR)$(KWNNBINDIR)/kserver
++	$(LIBTOOL) $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) kserver $(DESTDIR)$(KWNNBINDIR)/kserver
+ 
+ includes:: $(HDRS) $(SRC0) $(SRC1)
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-ay b/japanese/FreeWnn-lib/files/patch-ay
new file mode 100644
index 000000000000..102f7eff77bb
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-ay
@@ -0,0 +1,15 @@
+--- ../Xsi.org/kWnn/romkan/Makefile.in	Sun Jan 30 15:50:24 2000
++++ kWnn/romkan/Makefile.in	Thu Aug 31 09:54:43 2000
+@@ -53,9 +53,11 @@
+ 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
++	$(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+ clean::
++	$(RM) -r .libs
++	$(RM) *.lo *.la
+ 
+ all:: $(HDRS) $(SRCS) $(OBJS)
+