Index: satori/makefile.cygwin
===================================================================
RCS file: /usr/local/cvsrepos/satori/satori/makefile.cygwin,v
retrieving revision 1.1
diff -u -r1.1 makefile.cygwin
--- satori/makefile.cygwin	8 Apr 2004 08:00:51 -0000	1.1
+++ satori/makefile.cygwin	24 Apr 2005 11:12:36 -0000
@@ -3,7 +3,8 @@
 # 使用するツール類の設定
 CXX = g++
 LD = g++
-STRIP= strip
+STRIP = strip
+MKDEP = mkdep
 
 # 作るライブラリ名の設定
 # これはdarwin用の設定で、libsatori.bundleを生成する。
@@ -40,22 +41,55 @@
 	satori_load_unload.o \
 	satori_sentence.o \
 	satori_tool.o \
-	shiori_plugin.o
+	shiori_plugin.o \
+	$(NULL)
+LIBSSU_OBJ = \
+	../_/Sender.o \
+	../_/Utilities.o \
+	../_/calc.o \
+	../_/calc_float.o \
+	../_/stltool.o \
+	SakuraCS.o \
+	SakuraDLLHost.o \
+	SaoriHost.o \
+	ssu.o \
+	$(NULL)
+
+LIBSATORI = $(DYLIB_NAME_PREFIX)satori$(DYLIB_NAME_POSTFIX)
+LIBSSU = $(DYLIB_NAME_PREFIX)ssu$(DYLIB_NAME_POSTFIX)
 
-DYLIB_NAME = $(DYLIB_NAME_PREFIX)satori$(DYLIB_NAME_POSTFIX)
+all: $(LIBSATORI) $(LIBSSU)
 
-all: $(DYLIB_NAME)
+depend:
+	mkdep $(CXXFLAGS) $(CXXFLAGS_ADD) $(LIBSATORI_OBJ:.o=.cpp) $(LIBSSU_OBJ:.o=.cpp)
 
 clean:
-	rm -f $(DYLIB_NAME)
-	rm -f $(LIBSATORI_OBJ)
+	rm -f $(LIBSATORI) $(LIBSATORI_OBJ)
+	rm -f $(LIBSSU) $(LIBSSU_OBJ)
 
-$(DYLIB_NAME): $(LIBSATORI_OBJ)
+$(LIBSATORI): $(LIBSATORI_OBJ)
 	$(LD) -o $@ $(LIBSATORI_OBJ) $(LDFLAGS)
 	$(STRIP) -x $@
 
+$(LIBSSU): $(LIBSSU_OBJ)
+	$(LD) -o $@ $(LIBSSU_OBJ) $(LDFLAGS)
+	$(STRIP) -x $@
+
 .cpp.o:
 	$(CXX) $(CXXFLAGS) $(CXXFLAGS_ADD) -o $@ -c $<
 
-.PHONY: all clean
+DESTDIR = satori-src
+dist:
+	rm -rf $(DESTDIR)
+	mkdir -p $(DESTDIR)
+	cp -f ../satori_license.txt $(DESTDIR)
+	mkdir -p $(DESTDIR)/_
+	cp -f ../_/*.cpp ../_/*.h $(DESTDIR)/_
+	mkdir -p $(DESTDIR)/satori
+	cp -f *.cpp *.h makefile.* *.html *.dsp *.dsw $(DESTDIR)/satori
+	mkdir -p $(DESTDIR)/satori/test
+	cp -f test/*.txt test/*.ini $(DESTDIR)/satori/test
+	zip -r $(DESTDIR).zip $(DESTDIR)
+	rm -rf $(DESTDIR)
 
+.PHONY: all clean depend dist
Index: satori/makefile.posix
===================================================================
RCS file: /usr/local/cvsrepos/satori/satori/makefile.posix,v
retrieving revision 1.2
diff -u -r1.2 makefile.posix
--- satori/makefile.posix	25 Feb 2004 19:06:56 -0000	1.2
+++ satori/makefile.posix	24 Apr 2005 11:12:34 -0000
@@ -41,7 +41,8 @@
 	satori_load_unload.o \
 	satori_sentence.o \
 	satori_tool.o \
-	shiori_plugin.o
+	shiori_plugin.o \
+	$(NULL)
 LIBSSU_OBJ = \
 	../_/Sender.o \
 	../_/Utilities.o \
@@ -51,7 +52,8 @@
 	SakuraCS.o \
 	SakuraDLLHost.o \
 	SaoriHost.o \
-	ssu.o
+	ssu.o \
+	$(NULL)
 
 LIBSATORI = $(DYLIB_NAME_PREFIX)satori$(DYLIB_NAME_POSTFIX)
 LIBSSU = $(DYLIB_NAME_PREFIX)ssu$(DYLIB_NAME_POSTFIX)
@@ -76,4 +78,18 @@
 .cpp.o:
 	$(CXX) $(CXXFLAGS) $(CXXFLAGS_ADD) -o $@ -c $<
 
-.PHONY: all clean depend
\ No newline at end of file
+DESTDIR = satori-src
+dist:
+	rm -rf $(DESTDIR)
+	mkdir -p $(DESTDIR)
+	cp -f ../satori_license.txt $(DESTDIR)
+	mkdir -p $(DESTDIR)/_
+	cp -f ../_/*.cpp ../_/*.h $(DESTDIR)/_
+	mkdir -p $(DESTDIR)/satori
+	cp -f *.cpp *.h makefile.* *.html *.dsp *.dsw $(DESTDIR)/satori
+	mkdir -p $(DESTDIR)/satori/test
+	cp -f test/*.txt test/*.ini $(DESTDIR)/satori/test
+	zip -r $(DESTDIR).zip $(DESTDIR)
+	rm -rf $(DESTDIR)
+
+.PHONY: all clean depend dist
Index: satori/satori_load_unload.cpp
===================================================================
RCS file: /usr/local/cvsrepos/satori/satori/satori_load_unload.cpp,v
retrieving revision 1.3
diff -u -r1.3 satori_load_unload.cpp
--- satori/satori_load_unload.cpp	8 Apr 2004 08:00:51 -0000	1.3
+++ satori/satori_load_unload.cpp	23 Apr 2005 20:00:52 -0000
@@ -17,6 +17,7 @@
 #include	<ctime>	// for randomize
 
 #include	"../_/Utilities.h"
+#include	"../_/stltool.h"
 
 #ifdef POSIX
 #  include      "posix_utils.h"
@@ -241,7 +242,7 @@
 		LoadDicFolder(mBaseFolder);	// ルートフォルダの辞書
 	} else {
 		for ( ; i!=dic_folder.end() ; ++i )
-			LoadDicFolder(mBaseFolder + *i +"\\");	// サブフォルダの辞書
+			LoadDicFolder(mBaseFolder + *i + DIR_CHAR);	// サブフォルダの辞書
 	}
 
 	//------------------------------------------