===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Windows/Makefile,v
retrieving revision 1.22
retrieving revision 1.28
diff -u -p -r1.22 -r1.28
--- OpenXM/misc/packages/Windows/Makefile	2002/08/10 07:05:47	1.22
+++ OpenXM/misc/packages/Windows/Makefile	2002/09/30 02:30:38	1.28
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.21 2002/08/09 07:51:28 fujimoto Exp $
+# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.27 2002/09/30 01:57:05 takayama Exp $
 OpenXM_TOP=../../../../OpenXM
 ASIR_LANG=ja
 #ASIR_LANG=en
@@ -12,9 +12,13 @@ WINASIR=c:/home/asir
 usage:
 	@echo "Targets: all build-tgz clean clean-work link-for-debug"
 	@echo "         remove-experimental gen-cd"
+	@echo "  The target all, gen-cd builds the directory OpenXM-win" 
+	@echo "Other targets: win-correction3, build-bat"  
+	@echo "               asir-book "
 
-clean:
-	-rm -rf OpenXM-win .copy-binary-done .copy-binary-asir-done .copy-binary-phc-done OpenXM-win.tgz .OpenXM-win.tgz.done oxasir-win.rr .copy-cygwin-dlls-done .build-binary-openxm-cygwin-done OpenXM-unix OpenXM-doc
+clean: clean-OpenXM-win clean-asir-book
+clean-OpenXM-win:
+	-rm -rf OpenXM-win .copy-binary-done .copy-binary-asir-done .copy-binary-phc-done OpenXM-win.tgz .OpenXM-win.tgz.done oxasir-win.rr .copy-cygwin-dlls-done .build-binary-openxm-cygwin-done OpenXM-unix OpenXM-doc 
 
 clean-work:
 	-rm -rf work
@@ -110,6 +114,13 @@ win-correction2: win-correction1
 	cp oxasir-win.rr OpenXM-win/lib/asir
 	cp oxasir-win.rr OpenXM-win/lib/sm1
 
+## it is for an obsolete asirwin-*.tgz
+win-correction3: debug-tools/crlf
+	cp ${OpenXM_TOP}/../OpenXM_contrib2/asir2000/lib/xm OpenXM-win/asir/lib
+	cp ${OpenXM_TOP}/../OpenXM_contrib2/asir2000/lib/glib OpenXM-win/asir/lib
+	./debug-tools/crlf OpenXM-win/asir/lib/xm
+	./debug-tools/crlf OpenXM-win/asir/lib/glib
+
 win-correction-clean:
 	-find OpenXM-win -name '*~' -print | xargs rm -f
 	-rm -f OpenXM-win/lib/sm1/*.jpeg OpenXM-win/lib/sm1/*.jpg
@@ -153,8 +164,55 @@ remove-experimental:
 
 
 gen-cd:
-	-(make all; make remove-experimental)
+	-(make ASIR_LANG=${ASIR_LANG} all; make remove-experimental)
 	-mkdir OpenXM-unix
 	cp Readme-CD/readme-unix-en.html OpenXM-unix
 	(cd OpenXM-unix; wget ${WGET_HEAD} )
-	@echo "Copy OpenXM-unix and OpenXM-win to the CD."
\ No newline at end of file
+	@echo "Copy OpenXM-unix and OpenXM-win to the CD."
+
+asir-book: mkdir-asir-book copy-to-asir-book
+clean-asir-book:
+	-rm -rf asir-book .copy-to-asir-book-asir-bin .copy-to-asir-book-prog .copy-to-asir-book-meadow
+
+mkdir-asir-book: 
+	-(mkdir asir-book)
+	-(mkdir asir-book/asir)
+	-(mkdir asir-book/Meadow)
+	-(mkdir asir-book/Prog)
+
+copy-to-asir-book:  copy-to-asir-book-asir-bin copy-to-asir-book-prog copy-to-asir-book-meadow asir-book/index.html
+
+copy-to-asir-book-asir-bin:  copy-binary-asir
+	-if [ ! -f .copy-to-asir-book-asir-bin ]; then  \
+	  (cd asir-book ; tar xzvf ../work/asirwin-${ASIR_LANG}.tgz) ;\
+	fi
+	touch .copy-to-asir-book-asir-bin
+
+copy-to-asir-book-prog:
+	if [ ! -f .copy-to-asir-book-prog ]; then \
+	  (cd work; cvs-asir-book checkout asir-book) ; \
+	  (cp work/asir-book/Prog/*.rr asir-book/Prog) ; \
+	fi
+	touch .copy-to-asir-book-prog
+
+MEADOW=Meadow-1.14-i386-base.tar.gz
+WGET_MEADOW=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/1.2.2/${MEADOW}
+WINTAR=tar.exe
+WGET_WINTAR=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/1.2.2/${WINTAR}
+WINGZIP=gzip.exe
+WGET_WINGZIP=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/1.2.2/${WINGZIP}
+copy-to-asir-book-meadow:
+	if [ ! -f .copy-to-asir-book-meadow ]; then \
+	 if [ ! -f work/${MEADOW} ]; then \
+		(cd work ; wget ${WGET_MEADOW} ) ; \
+		(cd work ; wget ${WGET_WINTAR} ) ; \
+		(cd work ; wget ${WGET_WINGZIP} ) ; \
+	 fi ; \
+	 (cd asir-book ; cp ../work/${MEADOW} Meadow) ; \
+	 (cd asir-book ; cp ../work/${WINTAR} Meadow) ; \
+	 (cd asir-book ; cp ../work/${WINGZIP} Meadow) ; \
+	fi
+	touch .copy-to-asir-book-meadow
+
+asir-book/index.html: Readme-CD/asir-book-index.html
+	cp Readme-CD/asir-book-index.html asir-book/index.html