===================================================================
RCS file: /home/cvs/OpenXM/doc/OpenXM-specs/Makefile,v
retrieving revision 1.10
retrieving revision 1.20
diff -u -p -r1.10 -r1.20
--- OpenXM/doc/OpenXM-specs/Makefile	2003/03/25 11:22:17	1.10
+++ OpenXM/doc/OpenXM-specs/Makefile	2004/09/19 12:17:40	1.20
@@ -1,13 +1,17 @@
-#$OpenXM: OpenXM/doc/OpenXM-specs/Makefile,v 1.9 2000/11/30 02:41:36 takayama Exp $
+#$OpenXM: OpenXM/doc/OpenXM-specs/Makefile,v 1.19 2004/06/21 01:06:37 takayama Exp $
 all : doc
 
 LATEX2HTML=latex2html -tmp /tmp
+JFIX=${OpenXM_HOME}/src/util/sample1.sh
 DVIPS=dvips -f
 RSYNC=rsync -Cavz
 CURRENT=/home/web/OpenXM/Current
+NKF=nkf -e
 
-OXWEAVE=../../src/kxx/oxweave
+OXWEAVE=../../bin/oxweave
+OXWEAVE_C=../../src/util/oxweave.c
 OXWEAVEFLAG=--recursive --plain
+OXREPLACE=../../bin/oxreplace
 SRC= OpenXM.tex cmo-basic0.tex cmo-basic1.tex\
 cmo-register.tex communication-model.tex control.tex\
 error.tex formal-expression.tex howtowrite.tex\
@@ -16,6 +20,7 @@ ox-localdata.tex project.tex redefine.tex\
 stackmachine.tex start-session.tex string-expression.tex
 
 SRC101=OX-RFC-101.tex
+SRC103=OX-RFC-103.oxw
 
 doc: OpenXM-en.dvi OpenXM-ja.dvi OX-RFC-101-en.dvi OX-RFC-101-ja.dvi
 
@@ -30,7 +35,7 @@ OpenXM-en.dvi: $(OXWEAVE) $(SRC)
 OpenXM-ja.dvi: $(OXWEAVE) $(SRC)
 	-rm -rf tmpJA
 	-mkdir tmpJA
-	-for i in $(SRC); do $(OXWEAVE) $(OXWEAVEFLAG) C jp < $$i >tmpJA/$$i; done
+	-for i in $(SRC); do $(OXWEAVE) $(OXWEAVEFLAG) C jp < $$i | ${NKF} >tmpJA/$$i; done
 	-(cd tmpJA; ln -s ../reset.eps .; platex OpenXM; platex OpenXM)
 	-mv tmpJA/OpenXM.dvi OpenXM-ja.dvi
 	touch OpenXM-ja.dvi
@@ -46,41 +51,67 @@ OX-RFC-101-en.dvi: $(OXWEAVE) $(SRC101)
 OX-RFC-101-ja.dvi: $(OXWEAVE) $(SRC101)
 	-rm -rf tmp101JA
 	-mkdir tmp101JA
-	-for i in $(SRC101); do $(OXWEAVE) $(OXWEAVEFLAG) C jp < $$i | nkf -e >tmp101JA/$$i; done
+	-for i in $(SRC101); do $(OXWEAVE) $(OXWEAVEFLAG) C jp < $$i | ${NKF} >tmp101JA/$$i; done
 	-(cd tmp101JA;  platex OX-RFC-101; platex OX-RFC-101)
 	-mv tmp101JA/OX-RFC-101.dvi OX-RFC-101-ja.dvi
 	touch OX-RFC-101-ja.dvi
 
-$(OXWEAVE) : $(OXWEAVE).c
-	(cd ../../src/kxx ; make oxweave)
+OX-RFC-103-en.txt: $(OXWEAVE) $(SRC103)
+	-rm -rf tmp103EN
+	-mkdir tmp103EN
+	-for i in $(SRC103); do $(OXWEAVE) $(OXWEAVEFLAG) C en < $$i | ${NKF} >tmp103EN/$$i; done
+	-(cd tmp103EN; mv OX-RFC-103.oxw OX-RFC-103.txt)
+	-mv tmp103JA/OX-RFC-103.txt OX-RFC-103-en.txt
+OX-RFC-103-ja.txt: $(OXWEAVE) $(SRC103)
+	-rm -rf tmp103JA
+	-mkdir tmp103JA
+	-for i in $(SRC103); do $(OXWEAVE) $(OXWEAVEFLAG) C ja < $$i | ${NKF} >tmp103JA/$$i; done
+	-(cd tmp103JA; mv OX-RFC-103.oxw OX-RFC-103.txt)
+	-mv tmp103JA/OX-RFC-103.txt OX-RFC-103-ja.txt
+ox-rfc-104-ja.txt:  ox-rfc-104.oxw
+	echo "% DO NOT EDIT THIS FILE" >ox-rfc-104-ja.txt
+	$(OXWEAVE) $(OXWEAVEFLAG) C ja < ox-rfc-104.oxw >>ox-rfc-104-ja.txt
+ox-rfc-103-en.txt: OX-RFC-103.oxw
+	echo "% DO NOT EDIT THIS FILE" >ox-rfc-103-en.txt
+	$(OXWEAVE) $(OXWEAVEFLAG) C en < OX-RFC-103.oxw >>ox-rfc-103-en.txt
+ox-rfc-104-en.txt:  ox-rfc-104.oxw
+	echo "% DO NOT EDIT THIS FILE" >ox-rfc-104-en.txt
+	$(OXWEAVE) $(OXWEAVEFLAG) C en < ox-rfc-104.oxw >>ox-rfc-104-en.txt
 
-all-html: doc .all-html-100-en.done .all-html-101-en.done
-	if test ! -f .all-html-100-ja.done ; \
-	then \
-		(cd tmpJA; platex OpenXM; platex OpenXM ; $(LATEX2HTML) OpenXM) ; \
-		touch .all-html-100-ja.done ; \
-	fi
+
+$(OXWEAVE) : $(OXWEAVE_C)
+	(cd ../../src/util ; make oxweave)
+
+all-html: all-html-ja all-html-en
+all-html-en: doc
 	if test ! -f .all-html-100-en.done ; \
 	then \
 		(cd tmpEN ; latex OpenXM; latex OpenXM ; $(LATEX2HTML) OpenXM ) ; \
+	    (cd tmpEN/OpenXM ; $(JFIX) *.html ; rm -f *-tmp.old ) ; \
 		touch .all-html-100-en.done ; \
 	fi
-	if test ! -f .all-html-101-ja.done ; \
-	then \
-		(cd tmp101JA; platex OX-RFC-101; platex OX-RFC-101 ; $(LATEX2HTML) OX-RFC-101 ) ; \
-		touch .all-html-101-ja.done ; \
-	fi
 	if test ! -f .all-html-101-en.done ; \
 	then \
 		(cd tmp101EN ; latex OX-RFC-101; latex OX-RFC-101 ; $(LATEX2HTML) OX-RFC-101 ) ; \
+	    (cd tmp101EN/OX-RFC-101 ; $(JFIX) *.html ; rm -f *-tmp.old ) ; \
 		touch .all-html-101-en.done ; \
 	fi
 
-.all-html-100-en.done: ${SRC}
-	make clean-done
-.all-html-101-en.done: ${SRC101}
-	make clean-done
+all-html-ja: doc 
+	if test ! -f .all-html-100-ja.done ; \
+	then \
+		(cd tmpJA; platex OpenXM; platex OpenXM ; $(LATEX2HTML) OpenXM) ; \
+		(cd tmpJA/OpenXM; ../../${OXREPLACE} --old iso-8859-1 --new euc-jp *.html) ; \
+		touch .all-html-100-ja.done ; \
+	fi
+	if test ! -f .all-html-101-ja.done ; \
+	then \
+		(cd tmp101JA; platex OX-RFC-101; platex OX-RFC-101 ; $(LATEX2HTML) OX-RFC-101 ) ; \
+		(cd tmp101JA/OX-RFC-101; ../../${OXREPLACE} --old iso-8859-1 --new euc-jp *.html) ; \
+		touch .all-html-101-ja.done ; \
+	fi
 
+
 install-web-all: all-html
 	if test ! -d ${CURRENT}/doc ; then mkdir ${CURRENT}/doc ; fi  
 	if test ! -d ${CURRENT}/doc/OX-RFC-100-en ; then mkdir ${CURRENT}/doc/OX-RFC-100-en ; fi  
@@ -99,9 +130,10 @@ install-web-all: all-html
 
 
 clean : clean-done
-	/bin/rm -rf tmpEN tmpJA tmp101EN tmp101JA
-	/bin/rm -f OpenXM-en.dvi OpenXM-ja.dvi OX-RFC-101-en.dvi OX-RFC-101-ja.dvi
+	/bin/rm -rf tmpEN tmpJA tmp101EN tmp101JA tmp103EN tmp103JA
+	/bin/rm -f OpenXM-en.dvi OpenXM-ja.dvi OX-RFC-101-en.dvi OX-RFC-101-ja.dvi OX-RFC-103-ja.txt OX-RFC-103-en.txt ox-rfc-104-ja.txt ox-rfc-104-en.txt
 clean-done:
 	/bin/rm -f .[a-z]*done
-
+clean-en-done:
+	/bin/rm -f .[a-z]*-en.done