===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Windows/Makefile,v
retrieving revision 1.20
retrieving revision 1.23
diff -u -p -r1.20 -r1.23
--- OpenXM/misc/packages/Windows/Makefile	2002/07/31 02:00:26	1.20
+++ OpenXM/misc/packages/Windows/Makefile	2002/08/10 11:12:31	1.23
@@ -1,27 +1,32 @@
-# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.19 2002/07/31 00:39:44 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.22 2002/08/10 07:05:47 takayama Exp $
 OpenXM_TOP=../../../../OpenXM
 ASIR_LANG=ja
 #ASIR_LANG=en
+VERSION=1.2.2
 WGET_ARG=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/asir/asirwin-${ASIR_LANG}.tgz
+WGET_PHC=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/1.2.2/phc.exe
+WGET_HEAD=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/Head/openxm-head.tar.gz
 
 WINASIR=c:/home/asir
 
 usage:
 	@echo "Targets: all build-tgz clean clean-work link-for-debug"
-	@echo "         remove-experimental "
+	@echo "         remove-experimental gen-cd"
+	@echo :Other targets: win-correction3, build-bat"  
 
 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
+	-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
 clean0:
 	-rm -rf .copy-binary-done oxasir-win.rr .copy-cygwin-dlls-done
 
-all: copy-binary copy-binary-asir win-correction win-correction-clean
+all: copy-binary-phc copy-binary copy-binary-asir win-correction win-correction-clean
 
 build-binary-openxm-cygwin:
 	if [ ! -f .build-binary-openxm-cygwin-done ] ; then \
-		(cd ${OpenXM_TOP}/src ; make install-kan-ox ) ; \
+		(cd ${OpenXM_TOP}/src ; make install-kan-ox ; make install-phc) ; \
 		touch .build-binary-openxm-cygwin-done ; \
 	fi
 
@@ -38,7 +43,8 @@ copy-binary-openxm-cygwin: build-binary-openxm-cygwin
 	   rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/src/asir-contrib src ; \
 	   find . -name 'CVS' -print | xargs rm -rf ; \
 	  ) ; \
-	   cp readme-ja.html OpenXM-win ; \
+	   cp Readme-CD/readme-ja.html OpenXM-win ; \
+	   cp Readme-CD/readme-en.html OpenXM-win ; \
 	   touch .copy-binary-done ; \
 	fi 
 
@@ -66,6 +72,17 @@ copy-binary-asir-from-local-disk:
 	  touch .copy-binary-asir-done ; \
 	fi
 
+copy-binary-phc:
+	if [ ! -f .copy-binary-phc-done ] ; then \
+		make copy-binary-phc-from-internet ; \
+	fi
+
+copy-binary-phc-from-internet:
+	if [ ! -f ${OpenXM_TOP}/bin/phc.exe ] ; then \
+	 (cd ${OpenXM_TOP}/bin ; wget ${WGET_PHC} ) ; \
+	fi
+	touch .copy-binary-phc-done
+
 copy-cygwin-dlls:
 	if [ ! -f .copy-cygwin-dlls-done ] ; then \
 	 cp /bin/cygwin1.dll OpenXM-win/bin-windows ; \
@@ -94,6 +111,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
@@ -136,3 +160,9 @@ remove-experimental:
 	-rm -f OpenXM-win/bin-windows/*web*.bat
 
 
+gen-cd:
+	-(make 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