===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Windows/Makefile,v
retrieving revision 1.32
retrieving revision 1.40
diff -u -p -r1.32 -r1.40
--- OpenXM/misc/packages/Windows/Makefile	2003/07/16 05:19:49	1.32
+++ OpenXM/misc/packages/Windows/Makefile	2004/12/17 00:13:09	1.40
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.31 2002/10/01 00:05:54 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.39 2004/10/14 07:57:42 takayama Exp $
 OpenXM_TOP=../../../../OpenXM
 ASIR_LANG=ja
 #ASIR_LANG=en
@@ -29,7 +29,7 @@ all: copy-binary-phc copy-binary copy-binary-asir win-
 
 build-binary-openxm-cygwin:
 	if [ ! -f .build-binary-openxm-cygwin-done ] ; then \
-		(cd ${OpenXM_TOP}/src ; make install-kan-ox ; make install-phc) ; \
+		(cd ${OpenXM_TOP}/src ; make install-asir-contrib ) ; \
 		touch .build-binary-openxm-cygwin-done ; \
 	fi
 
@@ -44,7 +44,9 @@ copy-binary-openxm-cygwin: build-binary-openxm-cygwin
 	   rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/rc . ; \
 	   rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/man . ; \
 	   rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/src/asir-contrib src ; \
+           rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/libexec . ; \
 	   find . -name 'CVS' -print | xargs rm -rf ; \
+	   find . -name 'DO_NOT_EDIT*' -print | xargs rm -rf ; \
 	  ) ; \
 	   cp Readme-CD/readme-ja.html OpenXM-win ; \
 	   cp Readme-CD/readme-en.html OpenXM-win ; \
@@ -76,7 +78,7 @@ copy-binary-asir-from-local-disk:
 	fi
 
 copy-binary-phc:
-	if [ ! -f .copy-binary-phc-done ] ; then \
+	-if [ ! -f .copy-binary-phc-done ] ; then \
 		make copy-binary-phc-from-internet ; \
 	fi
 
@@ -103,6 +105,7 @@ win-correction1: build-bat copy-cygwin-dlls
 #	(cd OpenXM-win/rc ; make clean ; make)
 win-correction2: win-correction1
 	cp oxasir-win.rr OpenXM-win/lib/sm1
+	cp oxasir-win.rr $(OpenXM_TOP)/lib/sm1
 win-correction2_old:
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/asir/bin
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/bin
@@ -158,15 +161,17 @@ debug-tools/crlf :  debug-tools/crlf.c
 	(cd debug-tools; gcc -o crlf crlf.c)
 debug-tools/debug-sed : debug-tools/debug-sed.c
 	(cd debug-tools; gcc -o debug-sed debug-sed.c)
-build-bat: debug-tools/crlf debug-tools/debug-sed
+debug-tools/gcwd : debug-tools/gcwd.c
+	(cd debug-tools; gcc -o gcwd gcwd.c)
+build-bat: debug-tools/crlf debug-tools/debug-sed debug-tools/gcwd
 	-mkdir OpenXM-win/bin-windows
 	(cd debug-tools; sed -f dist.sed <asirgui-cd.bat >../OpenXM-win/bin-windows/asirgui-cd.bat ; ./crlf ../OpenXM-win/bin-windows/asirgui-cd.bat)
+	(cd debug-tools; sed -f dist.sed <sm1-cd.bat >../OpenXM-win/bin-windows/sm1-cd.bat ; ./crlf ../OpenXM-win/bin-windows/sm1-cd.bat)
 	(cd debug-tools; sed -f dist.sed <webasir.bat >../OpenXM-win/bin-windows/webasir.bat ; ./crlf ../OpenXM-win/bin-windows/webasir.bat)
 	(cd debug-tools; sed -f dist.sed <websm1.bat >../OpenXM-win/bin-windows/websm1.bat ; ./crlf ../OpenXM-win/bin-windows/websm1.bat)
 	(rm -f ../OpenXM-win/bin-windows/*.BAK ../OpenXM-win/bin-windows/*.bak)
 	cp OpenXM-win/bin-windows/asirgui-cd.bat OpenXM-win/asir/bin
-	rm -f debug-tools/debug.sed ; debug-tools/debug-sed `pwd` >debug-tools/debug.sed
-	(cd debug-tools; sed -f debug.sed <asirgui-cd.bat >asirgui-debug.bat ; ./crlf asirgui-debug.bat)
+	(cd debug-tools; cp gcwd.exe ../OpenXM-win/bin-windows) 
 
 remove-experimental:
 	-rm -f OpenXM-win/bin-windows/*web*.bat