diff --git a/CMakeLists.txt b/CMakeLists.txt index 10d0c97..fad3d96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,74 +37,74 @@ configure_file( include_directories("${CMAKE_BINARY_DIR}") add_library(sj3lib - lib/sj3lib/level1.c - lib/sj3lib/sj.c - lib/sj3lib/string.c + sj3lib/level1.c + sj3lib/sj.c + sj3lib/string.c ) target_include_directories(sj3lib PRIVATE include ) add_library(kanakan - lib/kanakan/adddic.c - lib/kanakan/addelcmn.c - lib/kanakan/alloc.c - lib/kanakan/charsize.c - lib/kanakan/chrtbl.c - lib/kanakan/cl2knj.c - lib/kanakan/clstudy.c - lib/kanakan/cmpstr.c - lib/kanakan/conjunc.c - lib/kanakan/connect.c - lib/kanakan/cvtclknj.c - lib/kanakan/cvtdict.c - lib/kanakan/cvtkanji.c - lib/kanakan/deldic.c - lib/kanakan/depend.c - lib/kanakan/dict.c - lib/kanakan/functbl.c - lib/kanakan/fuzoku.c - lib/kanakan/fzkyomi.c - lib/kanakan/getkanji.c - lib/kanakan/getrank.c - lib/kanakan/global.c - lib/kanakan/hzstrlen.c - lib/kanakan/init.c - lib/kanakan/istrcmp.c - lib/kanakan/memory.c - lib/kanakan/mk2claus.c - lib/kanakan/mkbunset.c - lib/kanakan/mkjiritu.c - lib/kanakan/mkkouho.c - lib/kanakan/mknumber.c - lib/kanakan/mvmemd.c - lib/kanakan/mvmemi.c - lib/kanakan/peepdic.c - lib/kanakan/ph2knj.c - lib/kanakan/ph_khtbl.c - lib/kanakan/priority.c - lib/kanakan/prtytbl.c - lib/kanakan/s2ctbl.c - lib/kanakan/selclrec.c - lib/kanakan/selsuuji.c - lib/kanakan/setconj.c - lib/kanakan/setjrec.c - lib/kanakan/setkouho.c - lib/kanakan/setubi.c - lib/kanakan/sj2code.c - lib/kanakan/skiphblk.c - lib/kanakan/skipkstr.c - lib/kanakan/srchdict.c - lib/kanakan/srchhead.c - lib/kanakan/srchidx.c - lib/kanakan/srchnum.c - lib/kanakan/stbtbl.c - lib/kanakan/stttbl.c - lib/kanakan/study.c - lib/kanakan/suujitbl.c - lib/kanakan/terminat.c - lib/kanakan/termtbl.c - lib/kanakan/wakachi.c + kanakan/adddic.c + kanakan/addelcmn.c + kanakan/alloc.c + kanakan/charsize.c + kanakan/chrtbl.c + kanakan/cl2knj.c + kanakan/clstudy.c + kanakan/cmpstr.c + kanakan/conjunc.c + kanakan/connect.c + kanakan/cvtclknj.c + kanakan/cvtdict.c + kanakan/cvtkanji.c + kanakan/deldic.c + kanakan/depend.c + kanakan/dict.c + kanakan/functbl.c + kanakan/fuzoku.c + kanakan/fzkyomi.c + kanakan/getkanji.c + kanakan/getrank.c + kanakan/global.c + kanakan/hzstrlen.c + kanakan/init.c + kanakan/istrcmp.c + kanakan/memory.c + kanakan/mk2claus.c + kanakan/mkbunset.c + kanakan/mkjiritu.c + kanakan/mkkouho.c + kanakan/mknumber.c + kanakan/mvmemd.c + kanakan/mvmemi.c + kanakan/peepdic.c + kanakan/ph2knj.c + kanakan/ph_khtbl.c + kanakan/priority.c + kanakan/prtytbl.c + kanakan/s2ctbl.c + kanakan/selclrec.c + kanakan/selsuuji.c + kanakan/setconj.c + kanakan/setjrec.c + kanakan/setkouho.c + kanakan/setubi.c + kanakan/sj2code.c + kanakan/skiphblk.c + kanakan/skipkstr.c + kanakan/srchdict.c + kanakan/srchhead.c + kanakan/srchidx.c + kanakan/srchnum.c + kanakan/stbtbl.c + kanakan/stttbl.c + kanakan/study.c + kanakan/suujitbl.c + kanakan/terminat.c + kanakan/termtbl.c + kanakan/wakachi.c ) target_include_directories(kanakan PRIVATE include @@ -118,7 +118,7 @@ add_executable(sj3serv sj3serv/setup.c ) target_include_directories(sj3serv - PRIVATE include lib/sj3lib + PRIVATE include sj3lib ) target_link_libraries(sj3serv sj3lib kanakan @@ -145,7 +145,7 @@ add_executable(sj3dic sj3dic/sjrc.c ) target_include_directories(sj3dic - PRIVATE include lib/sj3lib + PRIVATE include sj3lib ) target_link_libraries(sj3dic sj3lib @@ -167,7 +167,7 @@ add_executable(sj3mkdic sj3mkdic/string.c ) target_include_directories(sj3mkdic - PRIVATE sj3mkdic include lib/sj3lib + PRIVATE sj3mkdic include sj3lib ) target_link_libraries(sj3mkdic sj3lib diff --git a/lib/kanakan/adddic.c b/kanakan/adddic.c similarity index 100% rename from lib/kanakan/adddic.c rename to kanakan/adddic.c diff --git a/lib/kanakan/addelcmn.c b/kanakan/addelcmn.c similarity index 100% rename from lib/kanakan/addelcmn.c rename to kanakan/addelcmn.c diff --git a/lib/kanakan/alloc.c b/kanakan/alloc.c similarity index 100% rename from lib/kanakan/alloc.c rename to kanakan/alloc.c diff --git a/lib/kanakan/charsize.c b/kanakan/charsize.c similarity index 100% rename from lib/kanakan/charsize.c rename to kanakan/charsize.c diff --git a/lib/kanakan/chrtbl.c b/kanakan/chrtbl.c similarity index 100% rename from lib/kanakan/chrtbl.c rename to kanakan/chrtbl.c diff --git a/lib/kanakan/cl2knj.c b/kanakan/cl2knj.c similarity index 100% rename from lib/kanakan/cl2knj.c rename to kanakan/cl2knj.c diff --git a/lib/kanakan/clstudy.c b/kanakan/clstudy.c similarity index 100% rename from lib/kanakan/clstudy.c rename to kanakan/clstudy.c diff --git a/lib/kanakan/cmpstr.c b/kanakan/cmpstr.c similarity index 100% rename from lib/kanakan/cmpstr.c rename to kanakan/cmpstr.c diff --git a/lib/kanakan/conjunc.c b/kanakan/conjunc.c similarity index 100% rename from lib/kanakan/conjunc.c rename to kanakan/conjunc.c diff --git a/lib/kanakan/connect.c b/kanakan/connect.c similarity index 100% rename from lib/kanakan/connect.c rename to kanakan/connect.c diff --git a/lib/kanakan/cvtclknj.c b/kanakan/cvtclknj.c similarity index 100% rename from lib/kanakan/cvtclknj.c rename to kanakan/cvtclknj.c diff --git a/lib/kanakan/cvtdict.c b/kanakan/cvtdict.c similarity index 100% rename from lib/kanakan/cvtdict.c rename to kanakan/cvtdict.c diff --git a/lib/kanakan/cvtkanji.c b/kanakan/cvtkanji.c similarity index 100% rename from lib/kanakan/cvtkanji.c rename to kanakan/cvtkanji.c diff --git a/lib/kanakan/deldic.c b/kanakan/deldic.c similarity index 100% rename from lib/kanakan/deldic.c rename to kanakan/deldic.c diff --git a/lib/kanakan/depend.c b/kanakan/depend.c similarity index 100% rename from lib/kanakan/depend.c rename to kanakan/depend.c diff --git a/lib/kanakan/dict.c b/kanakan/dict.c similarity index 100% rename from lib/kanakan/dict.c rename to kanakan/dict.c diff --git a/lib/kanakan/functbl.c b/kanakan/functbl.c similarity index 100% rename from lib/kanakan/functbl.c rename to kanakan/functbl.c diff --git a/lib/kanakan/fuzoku.c b/kanakan/fuzoku.c similarity index 100% rename from lib/kanakan/fuzoku.c rename to kanakan/fuzoku.c diff --git a/lib/kanakan/fzkyomi.c b/kanakan/fzkyomi.c similarity index 100% rename from lib/kanakan/fzkyomi.c rename to kanakan/fzkyomi.c diff --git a/lib/kanakan/getkanji.c b/kanakan/getkanji.c similarity index 100% rename from lib/kanakan/getkanji.c rename to kanakan/getkanji.c diff --git a/lib/kanakan/getrank.c b/kanakan/getrank.c similarity index 100% rename from lib/kanakan/getrank.c rename to kanakan/getrank.c diff --git a/lib/kanakan/global.c b/kanakan/global.c similarity index 100% rename from lib/kanakan/global.c rename to kanakan/global.c diff --git a/lib/kanakan/hzstrlen.c b/kanakan/hzstrlen.c similarity index 100% rename from lib/kanakan/hzstrlen.c rename to kanakan/hzstrlen.c diff --git a/lib/kanakan/init.c b/kanakan/init.c similarity index 100% rename from lib/kanakan/init.c rename to kanakan/init.c diff --git a/lib/kanakan/istrcmp.c b/kanakan/istrcmp.c similarity index 100% rename from lib/kanakan/istrcmp.c rename to kanakan/istrcmp.c diff --git a/lib/kanakan/memory.c b/kanakan/memory.c similarity index 100% rename from lib/kanakan/memory.c rename to kanakan/memory.c diff --git a/lib/kanakan/mk2claus.c b/kanakan/mk2claus.c similarity index 100% rename from lib/kanakan/mk2claus.c rename to kanakan/mk2claus.c diff --git a/lib/kanakan/mkbunset.c b/kanakan/mkbunset.c similarity index 100% rename from lib/kanakan/mkbunset.c rename to kanakan/mkbunset.c diff --git a/lib/kanakan/mkjiritu.c b/kanakan/mkjiritu.c similarity index 100% rename from lib/kanakan/mkjiritu.c rename to kanakan/mkjiritu.c diff --git a/lib/kanakan/mkkouho.c b/kanakan/mkkouho.c similarity index 100% rename from lib/kanakan/mkkouho.c rename to kanakan/mkkouho.c diff --git a/lib/kanakan/mknumber.c b/kanakan/mknumber.c similarity index 100% rename from lib/kanakan/mknumber.c rename to kanakan/mknumber.c diff --git a/lib/kanakan/mvmemd.c b/kanakan/mvmemd.c similarity index 100% rename from lib/kanakan/mvmemd.c rename to kanakan/mvmemd.c diff --git a/lib/kanakan/mvmemi.c b/kanakan/mvmemi.c similarity index 100% rename from lib/kanakan/mvmemi.c rename to kanakan/mvmemi.c diff --git a/lib/kanakan/peepdic.c b/kanakan/peepdic.c similarity index 100% rename from lib/kanakan/peepdic.c rename to kanakan/peepdic.c diff --git a/lib/kanakan/ph2knj.c b/kanakan/ph2knj.c similarity index 100% rename from lib/kanakan/ph2knj.c rename to kanakan/ph2knj.c diff --git a/lib/kanakan/ph_khtbl.c b/kanakan/ph_khtbl.c similarity index 100% rename from lib/kanakan/ph_khtbl.c rename to kanakan/ph_khtbl.c diff --git a/lib/kanakan/priority.c b/kanakan/priority.c similarity index 100% rename from lib/kanakan/priority.c rename to kanakan/priority.c diff --git a/lib/kanakan/prtytbl.c b/kanakan/prtytbl.c similarity index 100% rename from lib/kanakan/prtytbl.c rename to kanakan/prtytbl.c diff --git a/lib/kanakan/s2ctbl.c b/kanakan/s2ctbl.c similarity index 100% rename from lib/kanakan/s2ctbl.c rename to kanakan/s2ctbl.c diff --git a/lib/kanakan/selclrec.c b/kanakan/selclrec.c similarity index 100% rename from lib/kanakan/selclrec.c rename to kanakan/selclrec.c diff --git a/lib/kanakan/selsuuji.c b/kanakan/selsuuji.c similarity index 100% rename from lib/kanakan/selsuuji.c rename to kanakan/selsuuji.c diff --git a/lib/kanakan/setconj.c b/kanakan/setconj.c similarity index 100% rename from lib/kanakan/setconj.c rename to kanakan/setconj.c diff --git a/lib/kanakan/setjrec.c b/kanakan/setjrec.c similarity index 100% rename from lib/kanakan/setjrec.c rename to kanakan/setjrec.c diff --git a/lib/kanakan/setkouho.c b/kanakan/setkouho.c similarity index 100% rename from lib/kanakan/setkouho.c rename to kanakan/setkouho.c diff --git a/lib/kanakan/setubi.c b/kanakan/setubi.c similarity index 100% rename from lib/kanakan/setubi.c rename to kanakan/setubi.c diff --git a/lib/kanakan/sj2code.c b/kanakan/sj2code.c similarity index 100% rename from lib/kanakan/sj2code.c rename to kanakan/sj2code.c diff --git a/lib/kanakan/skiphblk.c b/kanakan/skiphblk.c similarity index 100% rename from lib/kanakan/skiphblk.c rename to kanakan/skiphblk.c diff --git a/lib/kanakan/skipkstr.c b/kanakan/skipkstr.c similarity index 100% rename from lib/kanakan/skipkstr.c rename to kanakan/skipkstr.c diff --git a/lib/kanakan/srchdict.c b/kanakan/srchdict.c similarity index 100% rename from lib/kanakan/srchdict.c rename to kanakan/srchdict.c diff --git a/lib/kanakan/srchhead.c b/kanakan/srchhead.c similarity index 100% rename from lib/kanakan/srchhead.c rename to kanakan/srchhead.c diff --git a/lib/kanakan/srchidx.c b/kanakan/srchidx.c similarity index 100% rename from lib/kanakan/srchidx.c rename to kanakan/srchidx.c diff --git a/lib/kanakan/srchnum.c b/kanakan/srchnum.c similarity index 100% rename from lib/kanakan/srchnum.c rename to kanakan/srchnum.c diff --git a/lib/kanakan/stbtbl.c b/kanakan/stbtbl.c similarity index 100% rename from lib/kanakan/stbtbl.c rename to kanakan/stbtbl.c diff --git a/lib/kanakan/stttbl.c b/kanakan/stttbl.c similarity index 100% rename from lib/kanakan/stttbl.c rename to kanakan/stttbl.c diff --git a/lib/kanakan/study.c b/kanakan/study.c similarity index 100% rename from lib/kanakan/study.c rename to kanakan/study.c diff --git a/lib/kanakan/suujitbl.c b/kanakan/suujitbl.c similarity index 100% rename from lib/kanakan/suujitbl.c rename to kanakan/suujitbl.c diff --git a/lib/kanakan/terminat.c b/kanakan/terminat.c similarity index 100% rename from lib/kanakan/terminat.c rename to kanakan/terminat.c diff --git a/lib/kanakan/termtbl.c b/kanakan/termtbl.c similarity index 100% rename from lib/kanakan/termtbl.c rename to kanakan/termtbl.c diff --git a/lib/kanakan/wakachi.c b/kanakan/wakachi.c similarity index 100% rename from lib/kanakan/wakachi.c rename to kanakan/wakachi.c diff --git a/lib/sj3lib/level1.c b/sj3lib/level1.c similarity index 100% rename from lib/sj3lib/level1.c rename to sj3lib/level1.c diff --git a/lib/sj3lib/sj.c b/sj3lib/sj.c similarity index 100% rename from lib/sj3lib/sj.c rename to sj3lib/sj.c diff --git a/lib/sj3lib/sj3lib.h b/sj3lib/sj3lib.h similarity index 100% rename from lib/sj3lib/sj3lib.h rename to sj3lib/sj3lib.h diff --git a/lib/sj3lib/sj_string.h b/sj3lib/sj_string.h similarity index 100% rename from lib/sj3lib/sj_string.h rename to sj3lib/sj_string.h diff --git a/lib/sj3lib/string.c b/sj3lib/string.c similarity index 100% rename from lib/sj3lib/string.c rename to sj3lib/string.c