From f36f0bd805828809a22661d697b953c70e9df70f Mon Sep 17 00:00:00 2001 From: Masanori Ogino Date: Thu, 7 Dec 2023 14:22:41 +0900 Subject: [PATCH] Build kanakan Signed-off-by: Masanori Ogino --- Makefile | 21 ++++++++++++++++++++- kanakan/adddic.c => adddic.c | 0 kanakan/addelcmn.c => addelcmn.c | 0 kanakan/alloc.c => alloc.c | 0 char.c | 2 +- kanakan/charsize.c => charsize.c | 0 kanakan/chrtbl.c => chrtbl.c | 0 kanakan/cl2knj.c => cl2knj.c | 0 kanakan/clstudy.c => clstudy.c | 0 kanakan/cmpstr.c => cmpstr.c | 0 kanakan/conjunc.c => conjunc.c | 0 kanakan/connect.c => connect.c | 0 kanakan/cvtclknj.c => cvtclknj.c | 0 kanakan/cvtdict.c => cvtdict.c | 0 kanakan/cvtkanji.c => cvtkanji.c | 0 kanakan/deldic.c => deldic.c | 0 kanakan/depend.c => depend.c | 0 kanakan/dict.c => dict.c | 0 dicttool.h | 2 +- kanakan/functbl.c => functbl.c | 0 kanakan/fuzoku.c => fuzoku.c | 0 kanakan/fzkyomi.c => fzkyomi.c | 0 kanakan/getkanji.c => getkanji.c | 0 kanakan/getrank.c => getrank.c | 0 global.c | 2 +- kanakan/global.c => global2.c | 0 kanakan/hzstrlen.c => hzstrlen.c | 0 include/Struct.h | 1 + kanakan/init.c => init.c | 0 kanakan/istrcmp.c => istrcmp.c | 0 kanakan/kanakan.h => kanakan.h | 0 kanakan/memcpy.c => memcpy.c | 0 kanakan/memory.c => memory2.c | 0 kanakan/memset.c => memset.c | 0 kanakan/mk2claus.c => mk2claus.c | 0 kanakan/mkbunset.c => mkbunset.c | 0 kanakan/mkjiritu.c => mkjiritu.c | 0 kanakan/mkkouho.c => mkkouho.c | 0 kanakan/mknumber.c => mknumber.c | 0 kanakan/mvmemd.c => mvmemd.c | 0 kanakan/mvmemi.c => mvmemi.c | 0 kanakan/peepdic.c => peepdic.c | 0 kanakan/ph2knj.c => ph2knj.c | 0 kanakan/ph_khtbl.c => ph_khtbl.c | 0 kanakan/priority.c => priority.c | 0 kanakan/prtytbl.c => prtytbl.c | 0 kanakan/s2ctbl.c => s2ctbl.c | 0 kanakan/selclrec.c => selclrec.c | 0 kanakan/selsuuji.c => selsuuji.c | 0 kanakan/setconj.c => setconj.c | 0 kanakan/setjrec.c => setjrec.c | 0 kanakan/setkouho.c => setkouho.c | 0 kanakan/setubi.c => setubi.c | 0 kanakan/sj2code.c => sj2code.c | 0 sj_const.h => sj_const2.h | 0 sj_struct.h => sj_struct2.h | 2 +- kanakan/skiphblk.c => skiphblk.c | 0 kanakan/skipkstr.c => skipkstr.c | 0 kanakan/srchdict.c => srchdict.c | 0 kanakan/srchhead.c => srchhead.c | 0 kanakan/srchidx.c => srchidx.c | 0 kanakan/srchnum.c => srchnum.c | 0 kanakan/sstrcmp.c => sstrcmp.c | 0 kanakan/sstrlen.c => sstrlen.c | 0 kanakan/sstrncmp.c => sstrncmp.c | 0 kanakan/stbtbl.c => stbtbl.c | 0 kanakan/stttbl.c => stttbl.c | 0 kanakan/study.c => study.c | 0 kanakan/suujitbl.c => suujitbl.c | 0 kanakan/terminat.c => terminat.c | 0 kanakan/termtbl.c => termtbl.c | 0 kanakan/wakachi.c => wakachi.c | 0 72 files changed, 25 insertions(+), 5 deletions(-) rename kanakan/adddic.c => adddic.c (100%) rename kanakan/addelcmn.c => addelcmn.c (100%) rename kanakan/alloc.c => alloc.c (100%) rename kanakan/charsize.c => charsize.c (100%) rename kanakan/chrtbl.c => chrtbl.c (100%) rename kanakan/cl2knj.c => cl2knj.c (100%) rename kanakan/clstudy.c => clstudy.c (100%) rename kanakan/cmpstr.c => cmpstr.c (100%) rename kanakan/conjunc.c => conjunc.c (100%) rename kanakan/connect.c => connect.c (100%) rename kanakan/cvtclknj.c => cvtclknj.c (100%) rename kanakan/cvtdict.c => cvtdict.c (100%) rename kanakan/cvtkanji.c => cvtkanji.c (100%) rename kanakan/deldic.c => deldic.c (100%) rename kanakan/depend.c => depend.c (100%) rename kanakan/dict.c => dict.c (100%) rename kanakan/functbl.c => functbl.c (100%) rename kanakan/fuzoku.c => fuzoku.c (100%) rename kanakan/fzkyomi.c => fzkyomi.c (100%) rename kanakan/getkanji.c => getkanji.c (100%) rename kanakan/getrank.c => getrank.c (100%) rename kanakan/global.c => global2.c (100%) rename kanakan/hzstrlen.c => hzstrlen.c (100%) rename kanakan/init.c => init.c (100%) rename kanakan/istrcmp.c => istrcmp.c (100%) rename kanakan/kanakan.h => kanakan.h (100%) rename kanakan/memcpy.c => memcpy.c (100%) rename kanakan/memory.c => memory2.c (100%) rename kanakan/memset.c => memset.c (100%) rename kanakan/mk2claus.c => mk2claus.c (100%) rename kanakan/mkbunset.c => mkbunset.c (100%) rename kanakan/mkjiritu.c => mkjiritu.c (100%) rename kanakan/mkkouho.c => mkkouho.c (100%) rename kanakan/mknumber.c => mknumber.c (100%) rename kanakan/mvmemd.c => mvmemd.c (100%) rename kanakan/mvmemi.c => mvmemi.c (100%) rename kanakan/peepdic.c => peepdic.c (100%) rename kanakan/ph2knj.c => ph2knj.c (100%) rename kanakan/ph_khtbl.c => ph_khtbl.c (100%) rename kanakan/priority.c => priority.c (100%) rename kanakan/prtytbl.c => prtytbl.c (100%) rename kanakan/s2ctbl.c => s2ctbl.c (100%) rename kanakan/selclrec.c => selclrec.c (100%) rename kanakan/selsuuji.c => selsuuji.c (100%) rename kanakan/setconj.c => setconj.c (100%) rename kanakan/setjrec.c => setjrec.c (100%) rename kanakan/setkouho.c => setkouho.c (100%) rename kanakan/setubi.c => setubi.c (100%) rename kanakan/sj2code.c => sj2code.c (100%) rename sj_const.h => sj_const2.h (100%) rename sj_struct.h => sj_struct2.h (98%) rename kanakan/skiphblk.c => skiphblk.c (100%) rename kanakan/skipkstr.c => skipkstr.c (100%) rename kanakan/srchdict.c => srchdict.c (100%) rename kanakan/srchhead.c => srchhead.c (100%) rename kanakan/srchidx.c => srchidx.c (100%) rename kanakan/srchnum.c => srchnum.c (100%) rename kanakan/sstrcmp.c => sstrcmp.c (100%) rename kanakan/sstrlen.c => sstrlen.c (100%) rename kanakan/sstrncmp.c => sstrncmp.c (100%) rename kanakan/stbtbl.c => stbtbl.c (100%) rename kanakan/stttbl.c => stttbl.c (100%) rename kanakan/study.c => study.c (100%) rename kanakan/suujitbl.c => suujitbl.c (100%) rename kanakan/terminat.c => terminat.c (100%) rename kanakan/termtbl.c => termtbl.c (100%) rename kanakan/wakachi.c => wakachi.c (100%) diff --git a/Makefile b/Makefile index 23bf400..c315a5d 100644 --- a/Makefile +++ b/Makefile @@ -34,15 +34,31 @@ CFLAGS += -fPIC CPPFLAGS += -I. -I./include -I./sj3h LDFLAGS += -L. +# Public API library SJ3LIB_OBJS = level1.o sj3lib.o string.o + +# Private libraries +KANAKAN_OBJS = adddic.o addelcmn.o alloc.o charsize.o chrtbl.o cl2knj.o \ + clstudy.o cmpstr.o conjunc.o connect.o cvtclknj.o cvtdict.o \ + cvtkanji.o deldic.o depend.o dict.o functbl.o fuzoku.o \ + fzkyomi.o getkanji.o getrank.o global2.o hzstrlen.o init.o \ + istrcmp.o memcpy.o memory2.o memset.o mk2claus.o mkbunset.o \ + mkjiritu.o mkkouho.o mknumber.o mvmemd.o mvmemi.o peepdic.o \ + ph2knj.o ph_khtbl.o priority.o prtytbl.o s2ctbl.o selclrec.o \ + selsuuji.o setconj.o setjrec.o setkouho.o setubi.o sj2code.o \ + skiphblk.o skipkstr.o srchdict.o srchhead.o srchidx.o \ + srchnum.o sstrcmp.o sstrlen.o sstrncmp.o stbtbl.o stttbl.o \ + study.o suujitbl.o terminat.o termtbl.o wakachi.o SJ3RKCV_OBJS = rk_conv.o sj3_rkcv.o wc16_str.o + +# Client applications SJ3DIC_OBJS = codecnv.o dictdisp.o dictmake.o hinsi.o sj3dic.o sj3err.o \ sjrc.o SJ3MKDIC_OBJS = char.o cnvhinsi.o file.o global.o hindo.o knjcvt.o makedict.o \ makelist.o makeseg.o memory.o offset.o readline.o string2.o SJ3STAT_OBJS = sj3stat.o -all: libsj3lib.a libsj3lib.so.$(LIBVER) libsj3rkcv.a sj3dic sj3mkdic sj3stat +all: libsj3lib.a libsj3lib.so.$(LIBVER) libkanakan.a libsj3rkcv.a sj3dic sj3mkdic sj3stat install: all mkdir -p $(DESTDIR)$(BINDIR) @@ -63,6 +79,9 @@ libsj3lib.so.$(LIBVER): $(SJ3LIB_OBJS) compats.o $(CC) -shared -o $@ $(SJ3LIB_OBJS) compats.o $(LDFLAGS) -Wl,${LINKER_SONAME},$@ $(LDLIBS) ln -sf $@ `basename $@ .$(LIBVER)` +libkanakan.a: $(KANAKAN_OBJS) compats.o + $(AR) crs $@ $(KANAKAN_OBJS) compats.o + libsj3rkcv.a: $(SJ3RKCV_OBJS) compats.o $(AR) crs $@ $(SJ3RKCV_OBJS) compats.o diff --git a/kanakan/adddic.c b/adddic.c similarity index 100% rename from kanakan/adddic.c rename to adddic.c diff --git a/kanakan/addelcmn.c b/addelcmn.c similarity index 100% rename from kanakan/addelcmn.c rename to addelcmn.c diff --git a/kanakan/alloc.c b/alloc.c similarity index 100% rename from kanakan/alloc.c rename to alloc.c diff --git a/char.c b/char.c index c85eead..49dfbef 100644 --- a/char.c +++ b/char.c @@ -39,7 +39,7 @@ #include #include #include "sj_euc.h" -#include "sj_const.h" +#include "sj_const2.h" int diff --git a/kanakan/charsize.c b/charsize.c similarity index 100% rename from kanakan/charsize.c rename to charsize.c diff --git a/kanakan/chrtbl.c b/chrtbl.c similarity index 100% rename from kanakan/chrtbl.c rename to chrtbl.c diff --git a/kanakan/cl2knj.c b/cl2knj.c similarity index 100% rename from kanakan/cl2knj.c rename to cl2knj.c diff --git a/kanakan/clstudy.c b/clstudy.c similarity index 100% rename from kanakan/clstudy.c rename to clstudy.c diff --git a/kanakan/cmpstr.c b/cmpstr.c similarity index 100% rename from kanakan/cmpstr.c rename to cmpstr.c diff --git a/kanakan/conjunc.c b/conjunc.c similarity index 100% rename from kanakan/conjunc.c rename to conjunc.c diff --git a/kanakan/connect.c b/connect.c similarity index 100% rename from kanakan/connect.c rename to connect.c diff --git a/kanakan/cvtclknj.c b/cvtclknj.c similarity index 100% rename from kanakan/cvtclknj.c rename to cvtclknj.c diff --git a/kanakan/cvtdict.c b/cvtdict.c similarity index 100% rename from kanakan/cvtdict.c rename to cvtdict.c diff --git a/kanakan/cvtkanji.c b/cvtkanji.c similarity index 100% rename from kanakan/cvtkanji.c rename to cvtkanji.c diff --git a/kanakan/deldic.c b/deldic.c similarity index 100% rename from kanakan/deldic.c rename to deldic.c diff --git a/kanakan/depend.c b/depend.c similarity index 100% rename from kanakan/depend.c rename to depend.c diff --git a/kanakan/dict.c b/dict.c similarity index 100% rename from kanakan/dict.c rename to dict.c diff --git a/dicttool.h b/dicttool.h index a44534c..3e7e261 100644 --- a/dicttool.h +++ b/dicttool.h @@ -36,7 +36,7 @@ #include #include -#include "sj_struct.h" +#include "sj_struct2.h" /* char.c */ int cnvyomi (int code); diff --git a/kanakan/functbl.c b/functbl.c similarity index 100% rename from kanakan/functbl.c rename to functbl.c diff --git a/kanakan/fuzoku.c b/fuzoku.c similarity index 100% rename from kanakan/fuzoku.c rename to fuzoku.c diff --git a/kanakan/fzkyomi.c b/fzkyomi.c similarity index 100% rename from kanakan/fzkyomi.c rename to fzkyomi.c diff --git a/kanakan/getkanji.c b/getkanji.c similarity index 100% rename from kanakan/getkanji.c rename to getkanji.c diff --git a/kanakan/getrank.c b/getrank.c similarity index 100% rename from kanakan/getrank.c rename to getrank.c diff --git a/global.c b/global.c index deeae75..00c8029 100644 --- a/global.c +++ b/global.c @@ -36,7 +36,7 @@ #include #include -#include "sj_struct.h" +#include "sj_struct2.h" DouonRec *douon_ptr = NULL; int douon_num = 0; diff --git a/kanakan/global.c b/global2.c similarity index 100% rename from kanakan/global.c rename to global2.c diff --git a/kanakan/hzstrlen.c b/hzstrlen.c similarity index 100% rename from kanakan/hzstrlen.c rename to hzstrlen.c diff --git a/include/Struct.h b/include/Struct.h index d538af3..6bdd16e 100644 --- a/include/Struct.h +++ b/include/Struct.h @@ -38,6 +38,7 @@ #ifndef _Struct_H_ #define _Struct_H_ 1 +#include #include #include #include "sj_const.h" diff --git a/kanakan/init.c b/init.c similarity index 100% rename from kanakan/init.c rename to init.c diff --git a/kanakan/istrcmp.c b/istrcmp.c similarity index 100% rename from kanakan/istrcmp.c rename to istrcmp.c diff --git a/kanakan/kanakan.h b/kanakan.h similarity index 100% rename from kanakan/kanakan.h rename to kanakan.h diff --git a/kanakan/memcpy.c b/memcpy.c similarity index 100% rename from kanakan/memcpy.c rename to memcpy.c diff --git a/kanakan/memory.c b/memory2.c similarity index 100% rename from kanakan/memory.c rename to memory2.c diff --git a/kanakan/memset.c b/memset.c similarity index 100% rename from kanakan/memset.c rename to memset.c diff --git a/kanakan/mk2claus.c b/mk2claus.c similarity index 100% rename from kanakan/mk2claus.c rename to mk2claus.c diff --git a/kanakan/mkbunset.c b/mkbunset.c similarity index 100% rename from kanakan/mkbunset.c rename to mkbunset.c diff --git a/kanakan/mkjiritu.c b/mkjiritu.c similarity index 100% rename from kanakan/mkjiritu.c rename to mkjiritu.c diff --git a/kanakan/mkkouho.c b/mkkouho.c similarity index 100% rename from kanakan/mkkouho.c rename to mkkouho.c diff --git a/kanakan/mknumber.c b/mknumber.c similarity index 100% rename from kanakan/mknumber.c rename to mknumber.c diff --git a/kanakan/mvmemd.c b/mvmemd.c similarity index 100% rename from kanakan/mvmemd.c rename to mvmemd.c diff --git a/kanakan/mvmemi.c b/mvmemi.c similarity index 100% rename from kanakan/mvmemi.c rename to mvmemi.c diff --git a/kanakan/peepdic.c b/peepdic.c similarity index 100% rename from kanakan/peepdic.c rename to peepdic.c diff --git a/kanakan/ph2knj.c b/ph2knj.c similarity index 100% rename from kanakan/ph2knj.c rename to ph2knj.c diff --git a/kanakan/ph_khtbl.c b/ph_khtbl.c similarity index 100% rename from kanakan/ph_khtbl.c rename to ph_khtbl.c diff --git a/kanakan/priority.c b/priority.c similarity index 100% rename from kanakan/priority.c rename to priority.c diff --git a/kanakan/prtytbl.c b/prtytbl.c similarity index 100% rename from kanakan/prtytbl.c rename to prtytbl.c diff --git a/kanakan/s2ctbl.c b/s2ctbl.c similarity index 100% rename from kanakan/s2ctbl.c rename to s2ctbl.c diff --git a/kanakan/selclrec.c b/selclrec.c similarity index 100% rename from kanakan/selclrec.c rename to selclrec.c diff --git a/kanakan/selsuuji.c b/selsuuji.c similarity index 100% rename from kanakan/selsuuji.c rename to selsuuji.c diff --git a/kanakan/setconj.c b/setconj.c similarity index 100% rename from kanakan/setconj.c rename to setconj.c diff --git a/kanakan/setjrec.c b/setjrec.c similarity index 100% rename from kanakan/setjrec.c rename to setjrec.c diff --git a/kanakan/setkouho.c b/setkouho.c similarity index 100% rename from kanakan/setkouho.c rename to setkouho.c diff --git a/kanakan/setubi.c b/setubi.c similarity index 100% rename from kanakan/setubi.c rename to setubi.c diff --git a/kanakan/sj2code.c b/sj2code.c similarity index 100% rename from kanakan/sj2code.c rename to sj2code.c diff --git a/sj_const.h b/sj_const2.h similarity index 100% rename from sj_const.h rename to sj_const2.h diff --git a/sj_struct.h b/sj_struct2.h similarity index 98% rename from sj_struct.h rename to sj_struct2.h index 5cd47c0..a21a564 100644 --- a/sj_struct.h +++ b/sj_struct2.h @@ -36,7 +36,7 @@ -#include "sj_const.h" +#include "sj_const2.h" #ifndef _STRUCT_ #define _STRUCT_ diff --git a/kanakan/skiphblk.c b/skiphblk.c similarity index 100% rename from kanakan/skiphblk.c rename to skiphblk.c diff --git a/kanakan/skipkstr.c b/skipkstr.c similarity index 100% rename from kanakan/skipkstr.c rename to skipkstr.c diff --git a/kanakan/srchdict.c b/srchdict.c similarity index 100% rename from kanakan/srchdict.c rename to srchdict.c diff --git a/kanakan/srchhead.c b/srchhead.c similarity index 100% rename from kanakan/srchhead.c rename to srchhead.c diff --git a/kanakan/srchidx.c b/srchidx.c similarity index 100% rename from kanakan/srchidx.c rename to srchidx.c diff --git a/kanakan/srchnum.c b/srchnum.c similarity index 100% rename from kanakan/srchnum.c rename to srchnum.c diff --git a/kanakan/sstrcmp.c b/sstrcmp.c similarity index 100% rename from kanakan/sstrcmp.c rename to sstrcmp.c diff --git a/kanakan/sstrlen.c b/sstrlen.c similarity index 100% rename from kanakan/sstrlen.c rename to sstrlen.c diff --git a/kanakan/sstrncmp.c b/sstrncmp.c similarity index 100% rename from kanakan/sstrncmp.c rename to sstrncmp.c diff --git a/kanakan/stbtbl.c b/stbtbl.c similarity index 100% rename from kanakan/stbtbl.c rename to stbtbl.c diff --git a/kanakan/stttbl.c b/stttbl.c similarity index 100% rename from kanakan/stttbl.c rename to stttbl.c diff --git a/kanakan/study.c b/study.c similarity index 100% rename from kanakan/study.c rename to study.c diff --git a/kanakan/suujitbl.c b/suujitbl.c similarity index 100% rename from kanakan/suujitbl.c rename to suujitbl.c diff --git a/kanakan/terminat.c b/terminat.c similarity index 100% rename from kanakan/terminat.c rename to terminat.c diff --git a/kanakan/termtbl.c b/termtbl.c similarity index 100% rename from kanakan/termtbl.c rename to termtbl.c diff --git a/kanakan/wakachi.c b/wakachi.c similarity index 100% rename from kanakan/wakachi.c rename to wakachi.c