From 31407c37c9e24685045f47a5e937f0f89bac0a29 Mon Sep 17 00:00:00 2001 From: Satoshi Taoka Date: Wed, 8 Aug 2001 00:38:01 +0000 Subject: Update to 1.1.1-a018 All removed patch files was imported into FreeWnn --- japanese/FreeWnn-lib/files/patch-aa | 188 ------------------------------------ japanese/FreeWnn-lib/files/patch-ab | 29 ------ japanese/FreeWnn-lib/files/patch-ac | 15 --- japanese/FreeWnn-lib/files/patch-ad | 17 ---- japanese/FreeWnn-lib/files/patch-ae | 25 ----- japanese/FreeWnn-lib/files/patch-af | 13 --- japanese/FreeWnn-lib/files/patch-ag | 79 --------------- japanese/FreeWnn-lib/files/patch-ah | 102 ------------------- japanese/FreeWnn-lib/files/patch-ai | 94 ------------------ japanese/FreeWnn-lib/files/patch-aj | 94 ------------------ japanese/FreeWnn-lib/files/patch-ak | 11 --- japanese/FreeWnn-lib/files/patch-al | 11 --- japanese/FreeWnn-lib/files/patch-am | 11 --- japanese/FreeWnn-lib/files/patch-an | 11 --- japanese/FreeWnn-lib/files/patch-ao | 11 --- japanese/FreeWnn-lib/files/patch-ap | 82 ---------------- japanese/FreeWnn-lib/files/patch-aq | 80 --------------- japanese/FreeWnn-lib/files/patch-ar | 24 ----- japanese/FreeWnn-lib/files/patch-as | 15 --- japanese/FreeWnn-lib/files/patch-at | 82 ---------------- japanese/FreeWnn-lib/files/patch-au | 34 ------- japanese/FreeWnn-lib/files/patch-av | 15 --- japanese/FreeWnn-lib/files/patch-aw | 76 --------------- japanese/FreeWnn-lib/files/patch-ax | 19 ---- japanese/FreeWnn-lib/files/patch-ay | 15 --- 25 files changed, 1153 deletions(-) delete mode 100644 japanese/FreeWnn-lib/files/patch-aa delete mode 100644 japanese/FreeWnn-lib/files/patch-ab delete mode 100644 japanese/FreeWnn-lib/files/patch-ac delete mode 100644 japanese/FreeWnn-lib/files/patch-ad delete mode 100644 japanese/FreeWnn-lib/files/patch-ae delete mode 100644 japanese/FreeWnn-lib/files/patch-af delete mode 100644 japanese/FreeWnn-lib/files/patch-ag delete mode 100644 japanese/FreeWnn-lib/files/patch-ah delete mode 100644 japanese/FreeWnn-lib/files/patch-ai delete mode 100644 japanese/FreeWnn-lib/files/patch-aj delete mode 100644 japanese/FreeWnn-lib/files/patch-ak delete mode 100644 japanese/FreeWnn-lib/files/patch-al delete mode 100644 japanese/FreeWnn-lib/files/patch-am delete mode 100644 japanese/FreeWnn-lib/files/patch-an delete mode 100644 japanese/FreeWnn-lib/files/patch-ao delete mode 100644 japanese/FreeWnn-lib/files/patch-ap delete mode 100644 japanese/FreeWnn-lib/files/patch-aq delete mode 100644 japanese/FreeWnn-lib/files/patch-ar delete mode 100644 japanese/FreeWnn-lib/files/patch-as delete mode 100644 japanese/FreeWnn-lib/files/patch-at delete mode 100644 japanese/FreeWnn-lib/files/patch-au delete mode 100644 japanese/FreeWnn-lib/files/patch-av delete mode 100644 japanese/FreeWnn-lib/files/patch-aw delete mode 100644 japanese/FreeWnn-lib/files/patch-ax delete mode 100644 japanese/FreeWnn-lib/files/patch-ay (limited to 'japanese/FreeWnn-lib/files') diff --git a/japanese/FreeWnn-lib/files/patch-aa b/japanese/FreeWnn-lib/files/patch-aa deleted file mode 100644 index 3ed5d77c97d4..000000000000 --- a/japanese/FreeWnn-lib/files/patch-aa +++ /dev/null @@ -1,188 +0,0 @@ ---- 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 deleted file mode 100644 index 30db318a07f9..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.in.orig Tue Feb 1 22:18:59 2000 -+++ Makefile.in Tue Aug 29 14:32:22 2000 -@@ -31,13 +31,22 @@ - - include @top_srcdir@/makerule.mk - --WNNDIR = Wnn -+WNNDIR = @Wnn@ - --CWNNDIR = cWnn -+CWNNDIR = @cWnn@ - --KWNNDIR = kWnn -+KWNNDIR = @kWnn@ - --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 -+ -+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 deleted file mode 100644 index 1ff09596b5a4..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 deleted file mode 100644 index 36309e2d5793..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ad +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 deleted file mode 100644 index 8e0e5584551c..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ae +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 @@ - - WNNCLIENTSDIR = conv - --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 deleted file mode 100644 index d94fbdc19573..000000000000 --- a/japanese/FreeWnn-lib/files/patch-af +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 @@ - - 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@ - diff --git a/japanese/FreeWnn-lib/files/patch-ag b/japanese/FreeWnn-lib/files/patch-ag deleted file mode 100644 index ea8f84ae47df..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ag +++ /dev/null @@ -1,79 +0,0 @@ ---- 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 - -+# 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:: - diff --git a/japanese/FreeWnn-lib/files/patch-ah b/japanese/FreeWnn-lib/files/patch-ah deleted file mode 100644 index 52b33e5af906..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ah +++ /dev/null @@ -1,102 +0,0 @@ ---- ../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 deleted file mode 100644 index f4f2dd8de246..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ai +++ /dev/null @@ -1,94 +0,0 @@ ---- ../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 -+ - catod: $(OBJATOD) - $(RM) $@ -- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@ -+ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOD) @LIBS@ - - clean:: - $(RM) catod - - catof: $(OBJATOF) - $(RM) $@ -- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@ -+ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJATOF) @LIBS@ - - clean:: - $(RM) catof - - cwnntouch: $(OBJTOUCH) - $(RM) $@ -- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@ -+ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJTOUCH) @LIBS@ - - clean:: - $(RM) cwnntouch - - cdicsort: $(OBJSORT) - $(RM) $@ -- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT) -+ $(LIBTOOL) $(CCLINK) -o $@ $(LDOPTIONS) $(OBJSORT) - - 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 deleted file mode 100644 index ffae7afdfd44..000000000000 --- a/japanese/FreeWnn-lib/files/patch-aj +++ /dev/null @@ -1,94 +0,0 @@ ---- ../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 deleted file mode 100644 index 10c85c559fba..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index cf45f9e59562..000000000000 --- a/japanese/FreeWnn-lib/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 62819bda9ca8..000000000000 --- a/japanese/FreeWnn-lib/files/patch-am +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index d8948ce74626..000000000000 --- a/japanese/FreeWnn-lib/files/patch-an +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 04195d764537..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 0add98f308f1..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ap +++ /dev/null @@ -1,82 +0,0 @@ ---- 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 deleted file mode 100644 index c50f5ac01581..000000000000 --- a/japanese/FreeWnn-lib/files/patch-aq +++ /dev/null @@ -1,80 +0,0 @@ ---- 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 deleted file mode 100644 index 3943159ae669..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ar +++ /dev/null @@ -1,24 +0,0 @@ ---- ../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 deleted file mode 100644 index 2a45ab3125a1..000000000000 --- a/japanese/FreeWnn-lib/files/patch-as +++ /dev/null @@ -1,15 +0,0 @@ ---- ../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 deleted file mode 100644 index b274daf263d9..000000000000 --- a/japanese/FreeWnn-lib/files/patch-at +++ /dev/null @@ -1,82 +0,0 @@ ---- 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 deleted file mode 100644 index d3524772ab70..000000000000 --- a/japanese/FreeWnn-lib/files/patch-au +++ /dev/null @@ -1,34 +0,0 @@ ---- ../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 deleted file mode 100644 index 777118e448b6..000000000000 --- a/japanese/FreeWnn-lib/files/patch-av +++ /dev/null @@ -1,15 +0,0 @@ ---- ../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 deleted file mode 100644 index 40f477a9f6cc..000000000000 --- a/japanese/FreeWnn-lib/files/patch-aw +++ /dev/null @@ -1,76 +0,0 @@ ---- 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 deleted file mode 100644 index 179c77bc4bfb..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ax +++ /dev/null @@ -1,19 +0,0 @@ ---- ../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 deleted file mode 100644 index 102f7eff77bb..000000000000 --- a/japanese/FreeWnn-lib/files/patch-ay +++ /dev/null @@ -1,15 +0,0 @@ ---- ../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) - -- cgit v1.2.3