From 7a3060176a454da75bf1cb72d635aae5038123e9 Mon Sep 17 00:00:00 2001 From: Masanori Ogino Date: Mon, 27 Nov 2023 14:40:59 +0900 Subject: [PATCH] Flatten sj3mkdic Signed-off-by: Masanori Ogino --- dict/Imakefile | 40 ++++++++++++--- dict/dict/Imakefile | 67 -------------------------- dict/{dict => }/visual.dic | 0 {dict/tool => sj3mkdic}/GramTable | 0 {dict/tool => sj3mkdic}/Imakefile | 0 {dict/tool => sj3mkdic}/char.c | 0 {dict/tool => sj3mkdic}/cnvhinsi.c | 0 {dict/tool => sj3mkdic}/file.c | 0 {dict/tool => sj3mkdic}/global.c | 0 {dict/tool => sj3mkdic}/hindo.c | 0 {dict/tool => sj3mkdic}/knjcvt.c | 0 {dict/tool => sj3mkdic}/makedict.c | 0 {dict/tool => sj3mkdic}/makelist.c | 0 {dict/tool => sj3mkdic}/makeseg.c | 0 {dict/tool => sj3mkdic}/memory.c | 0 {dict/tool => sj3mkdic}/offset.c | 0 {dict/tool => sj3mkdic}/readline.c | 0 {dict/include => sj3mkdic}/sj_const.h | 0 {dict/include => sj3mkdic}/sj_macro.h | 0 {dict/include => sj3mkdic}/sj_struct.h | 0 {dict/tool => sj3mkdic}/string.c | 0 21 files changed, 33 insertions(+), 74 deletions(-) delete mode 100644 dict/dict/Imakefile rename dict/{dict => }/visual.dic (100%) rename {dict/tool => sj3mkdic}/GramTable (100%) rename {dict/tool => sj3mkdic}/Imakefile (100%) rename {dict/tool => sj3mkdic}/char.c (100%) rename {dict/tool => sj3mkdic}/cnvhinsi.c (100%) rename {dict/tool => sj3mkdic}/file.c (100%) rename {dict/tool => sj3mkdic}/global.c (100%) rename {dict/tool => sj3mkdic}/hindo.c (100%) rename {dict/tool => sj3mkdic}/knjcvt.c (100%) rename {dict/tool => sj3mkdic}/makedict.c (100%) rename {dict/tool => sj3mkdic}/makelist.c (100%) rename {dict/tool => sj3mkdic}/makeseg.c (100%) rename {dict/tool => sj3mkdic}/memory.c (100%) rename {dict/tool => sj3mkdic}/offset.c (100%) rename {dict/tool => sj3mkdic}/readline.c (100%) rename {dict/include => sj3mkdic}/sj_const.h (100%) rename {dict/include => sj3mkdic}/sj_macro.h (100%) rename {dict/include => sj3mkdic}/sj_struct.h (100%) rename {dict/tool => sj3mkdic}/string.c (100%) diff --git a/dict/Imakefile b/dict/Imakefile index 7f777ec..4211255 100644 --- a/dict/Imakefile +++ b/dict/Imakefile @@ -28,14 +28,40 @@ /* * $SonyRCSfile: Imakefile,v $ - * $SonyRevision: 1.1 $ - * $SonyDate: 1994/06/03 08:00:16 $ + * $SonyRevision: 1.4 $ + * $SonyDate: 1997/01/23 11:20:50 $ */ -#define IHaveSubdirs -#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' +/* + * Change some make rules. + * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10 + */ -SUBDIRS = tool dict +#include "../../sj3.tmpl" -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) +TOOL_DIR = ../tool +TOOL_NAME = sj3mkdic + +SRCS = ./visual.dic +OBJS = sj3main.dic +OUTPUT = Moutput + +XCOMM INSTFLAGS = -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444 + +all: $(OBJS) + +$(OBJS): $(SRCS) + $(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT) + +depend:: + +clean:: + $(RM) $(OBJS) $(OUTPUT) + +InstallNamedNonExec(sj3main.dic,sj3main.dic,$(SJ3DICTDIR)) + +install:: + if [ ! -d $(SJ3DICTDIR)/user ]; then \ @@\ + (mkdir $(SJ3DICTDIR)/user; \ @@\ + chown $(SJ3OWNER) $(SJ3DICTDIR)/user; \ @@\ + chgrp $(SJ3GROUP) $(SJ3DICTDIR)/user); fi diff --git a/dict/dict/Imakefile b/dict/dict/Imakefile deleted file mode 100644 index 4211255..0000000 --- a/dict/dict/Imakefile +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 1991-1994 Sony Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of Sony Corporation - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * from Sony Corporation. - */ - -/* - * $SonyRCSfile: Imakefile,v $ - * $SonyRevision: 1.4 $ - * $SonyDate: 1997/01/23 11:20:50 $ - */ - -/* - * Change some make rules. - * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10 - */ - -#include "../../sj3.tmpl" - -TOOL_DIR = ../tool -TOOL_NAME = sj3mkdic - -SRCS = ./visual.dic -OBJS = sj3main.dic -OUTPUT = Moutput - -XCOMM INSTFLAGS = -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444 - -all: $(OBJS) - -$(OBJS): $(SRCS) - $(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT) - -depend:: - -clean:: - $(RM) $(OBJS) $(OUTPUT) - -InstallNamedNonExec(sj3main.dic,sj3main.dic,$(SJ3DICTDIR)) - -install:: - if [ ! -d $(SJ3DICTDIR)/user ]; then \ @@\ - (mkdir $(SJ3DICTDIR)/user; \ @@\ - chown $(SJ3OWNER) $(SJ3DICTDIR)/user; \ @@\ - chgrp $(SJ3GROUP) $(SJ3DICTDIR)/user); fi diff --git a/dict/dict/visual.dic b/dict/visual.dic similarity index 100% rename from dict/dict/visual.dic rename to dict/visual.dic diff --git a/dict/tool/GramTable b/sj3mkdic/GramTable similarity index 100% rename from dict/tool/GramTable rename to sj3mkdic/GramTable diff --git a/dict/tool/Imakefile b/sj3mkdic/Imakefile similarity index 100% rename from dict/tool/Imakefile rename to sj3mkdic/Imakefile diff --git a/dict/tool/char.c b/sj3mkdic/char.c similarity index 100% rename from dict/tool/char.c rename to sj3mkdic/char.c diff --git a/dict/tool/cnvhinsi.c b/sj3mkdic/cnvhinsi.c similarity index 100% rename from dict/tool/cnvhinsi.c rename to sj3mkdic/cnvhinsi.c diff --git a/dict/tool/file.c b/sj3mkdic/file.c similarity index 100% rename from dict/tool/file.c rename to sj3mkdic/file.c diff --git a/dict/tool/global.c b/sj3mkdic/global.c similarity index 100% rename from dict/tool/global.c rename to sj3mkdic/global.c diff --git a/dict/tool/hindo.c b/sj3mkdic/hindo.c similarity index 100% rename from dict/tool/hindo.c rename to sj3mkdic/hindo.c diff --git a/dict/tool/knjcvt.c b/sj3mkdic/knjcvt.c similarity index 100% rename from dict/tool/knjcvt.c rename to sj3mkdic/knjcvt.c diff --git a/dict/tool/makedict.c b/sj3mkdic/makedict.c similarity index 100% rename from dict/tool/makedict.c rename to sj3mkdic/makedict.c diff --git a/dict/tool/makelist.c b/sj3mkdic/makelist.c similarity index 100% rename from dict/tool/makelist.c rename to sj3mkdic/makelist.c diff --git a/dict/tool/makeseg.c b/sj3mkdic/makeseg.c similarity index 100% rename from dict/tool/makeseg.c rename to sj3mkdic/makeseg.c diff --git a/dict/tool/memory.c b/sj3mkdic/memory.c similarity index 100% rename from dict/tool/memory.c rename to sj3mkdic/memory.c diff --git a/dict/tool/offset.c b/sj3mkdic/offset.c similarity index 100% rename from dict/tool/offset.c rename to sj3mkdic/offset.c diff --git a/dict/tool/readline.c b/sj3mkdic/readline.c similarity index 100% rename from dict/tool/readline.c rename to sj3mkdic/readline.c diff --git a/dict/include/sj_const.h b/sj3mkdic/sj_const.h similarity index 100% rename from dict/include/sj_const.h rename to sj3mkdic/sj_const.h diff --git a/dict/include/sj_macro.h b/sj3mkdic/sj_macro.h similarity index 100% rename from dict/include/sj_macro.h rename to sj3mkdic/sj_macro.h diff --git a/dict/include/sj_struct.h b/sj3mkdic/sj_struct.h similarity index 100% rename from dict/include/sj_struct.h rename to sj3mkdic/sj_struct.h diff --git a/dict/tool/string.c b/sj3mkdic/string.c similarity index 100% rename from dict/tool/string.c rename to sj3mkdic/string.c