===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Windows/Makefile,v
retrieving revision 1.15
retrieving revision 1.18
diff -u -p -r1.15 -r1.18
--- OpenXM/misc/packages/Windows/Makefile	2002/07/28 06:31:01	1.15
+++ OpenXM/misc/packages/Windows/Makefile	2002/07/30 00:28:00	1.18
@@ -1,19 +1,21 @@
-# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.14 2002/01/25 02:56:15 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.17 2002/07/28 08:10:24 takayama Exp $
 OpenXM_TOP=../../../../OpenXM
 ASIR_LANG=ja
 #ASIR_LANG=en
-WGET_ARG=--pasive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/asir/asirwin-${ASIR_LANG}.tgz
+WGET_ARG=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/asir/asirwin-${ASIR_LANG}.tgz
 
-STARTEXE=c:/windows/command/start.exe
 WINASIR=c:/home/asir
 
 usage:
 	@echo "Targets: all build-tgz clean clean-work link-for-debug"
+	@echo "         remove-experimental "
 
 clean:
 	-rm -rf OpenXM-win .copy-binary-done .copy-binary-asir-done OpenXM-win.tgz .OpenXM-win.tgz.done oxasir-win.rr .copy-cygwin-dlls-done .build-binary-openxm-cygwin-done
+clean-work:
+	-rm -rf work
 
-all: copy-binary copy-binary-asir win-correction
+all: copy-binary copy-binary-asir win-correction win-correction-clean
 
 build-binary-openxm-cygwin:
 	if [ ! -f .build-binary-openxm-cygwin-done ] ; then \
@@ -32,21 +34,24 @@ copy-binary-openxm-cygwin: build-binary-openxm-cygwin
 	   rsync -avz --delete ../${OpenXM_TOP}/rc . ; \
 	   rsync -avz --delete ../${OpenXM_TOP}/man . ; \
 	   rsync -avz --delete ../${OpenXM_TOP}/src/asir-contrib src ; \
+	   find . -name 'CVS' -print | xargs rm -rf ; \
 	  ) ; \
 	   cp readme-ja.html OpenXM-win ; \
 	   touch .copy-binary-done ; \
 	fi 
 
-copy-binary-asir: copy-binary-asir-from-internet
+copy-binary-asir:
+	if [ ! -f .copy-binary-asir-done ] ; then \
+		make copy-binary-asir-from-internet ; \
+	fi
 
 copy-binary-asir-from-internet:
 	-mkdir OpenXM-win
 	if [ ! -d work ] ; then mkdir work ; fi
 	if [ ! -f work/asirwin-${ASIR_LANG}.tgz ] ; then \
 		(cd work ; wget ${WGET_ARG} ) ; \
-		(cd work ; mv ftp.math.kobe-u.ac.jp/pub/asir/asirwin-${ASIR_LANG}.tgz .) ; \
 	fi
-	(cd OpenXM-win ; tar xzvf ../../work/asirwin-${ASIR_LANG}.tgz)
+	(cd OpenXM-win ; tar xzvf ../work/asirwin-${ASIR_LANG}.tgz)
 	touch .copy-binary-asir-done
 
 copy-binary-asir-from-local-disk:
@@ -73,26 +78,23 @@ win-correction: copy-binary oxasir-win.rr
 	make win-correction2 
 win-correction1: build-bat copy-cygwin-dlls
 	-mkdir OpenXM-win/bin-windows
-	-cp ${STARTEXE} OpenXM-win/bin-windows
 #	(cd OpenXM-win/rc ; make clean ; make)
 win-correction2: win-correction1
-	-cp ${STARTEXE} OpenXM-win/bin
-	-cp ${STARTEXE} OpenXM-win/asir/bin
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/asir/bin
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/bin
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/asir/bin
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/bin
 	cp OpenXM-win/lib/sm1/oxasir.asir OpenXM-win/asir/bin
 	cp OpenXM-win/lib/sm1/oxasir.asir OpenXM-win/bin
-	cp OpenXM-win/bin/ox_asir OpenXM-win/bin/ox_asir.exe
+	-cp OpenXM-win/bin/ox_asir OpenXM-win/bin/ox_asir.exe
 	cp oxasir-win.rr OpenXM-win/bin
 	cp oxasir-win.rr OpenXM-win/asir/bin
 	cp oxasir-win.rr OpenXM-win/lib/asir
 	cp oxasir-win.rr OpenXM-win/lib/sm1
 
 win-correction-clean:
-	-find OpenXM-win -name '*~' -print | xargs rm
-	-rm OpenXM-win/lib/sm1/*.jpeg OpenXM-win/lib/sm1/*.jpg
+	-find OpenXM-win -name '*~' -print | xargs rm -f
+	-rm -f OpenXM-win/lib/sm1/*.jpeg OpenXM-win/lib/sm1/*.jpg
 build-tgz: win-correction-clean
 	if [ ! -f .OpenXM-win.tgz.done ]; then \
 	tar czvf OpenXM-win.tgz OpenXM-win ; touch .OpenXM-win.tgz.done ; \
@@ -116,11 +118,19 @@ oxasir-win.rr : oxapp oxpp oxpp2
 
 debug-tools/crlf :  debug-tools/crlf.c
 	(cd debug-tools; gcc -o crlf crlf.c)
-build-bat: debug-tools/crlf
+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
 	-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 <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)
+
+remove-experimental:
+	-rm -f OpenXM-win/bin-windows/*web*.bat
+