===================================================================
RCS file: /home/cvs/OpenXM/src/asir-contrib/packages/doc/Attic/Makefile,v
retrieving revision 1.39
retrieving revision 1.57
diff -u -p -r1.39 -r1.57
--- OpenXM/src/asir-contrib/packages/doc/Attic/Makefile	2002/08/23 08:16:11	1.39
+++ OpenXM/src/asir-contrib/packages/doc/Attic/Makefile	2004/03/05 19:05:11	1.57
@@ -1,8 +1,8 @@
-#$OpenXM: OpenXM/src/asir-contrib/packages/doc/Makefile,v 1.38 2002/08/23 04:59:06 ohara Exp $
+#$OpenXM: OpenXM/src/asir-contrib/packages/doc/Makefile,v 1.56 2004/03/05 16:58:57 ohara Exp $
 # targets
-# all :   
+# all :
 #     Extracts all tex-info files from ../src/* and generate *.texi files.
-# install : install-document install-help
+# install : install-help
 # install-help : all
 #        Installing online help to OpenXM/lib/asir/help-*
 # install-document :  all  gen-dvi-ps
@@ -11,22 +11,24 @@
 #        Copy html help to OpenXM/doc/asir-contrib
 # gen-html-en  gen-html-ja
 #        Generate HTML documents under html-en and html-ja
+# gen-help-en  gen-help-ja
+#        Generate help files.
 # gen-dvi-ps
 #        Generate dvi and ps files.
 #
 # NOTE: install-help should be executed after installing asir2000.
 ########################################################################
 #  How to add new documents in the category xxx
-# "xxx*.texi <--- xxx.oxweave (manually written) + xxx*auto*.texi (automatic)"
-#   (1) "xxx.oxweave" --> xxx-en.texi and xxx-ja.texi
-#       xxx-auto-en.texi and xxx-auto-ja.texi should be included from 
-#       xxx-en.texi and xxx-ja.texi  (JPSRCS, EGSRCS)
-#     NOTE: xxx.oxweave might be embedded in xxx.rr or xxx, 
+# "xxx*.texi <--- xxx.oxweave (manually written) + xxx*-auto.{en,ja} (automatic)"
+#   (1) "xxx.oxweave" --> xxx.en and xxx.ja
+#       xxx-auto.en and xxx-auto.ja should be included from
+#       xxx.en and xxx.ja  (JASRCS, ENSRCS)
+#     NOTE: xxx.oxweave might be embedded in xxx.rr or xxx,
 #           but this style is obsolete.
-#   (2) "xxx.rr" or "xxx" --> xxx-auto-en.texi and xxx-auto-ja.texi 
+#   (2) "xxx.rr" or "xxx" --> xxx-auto.en and xxx-auto.ja
 #       (JAAUTO, ENAUTO)
 #       xxx-auto*.texi's are extracted from xxx or xxx.rr
-#   (3) xxx-en.texi and xxx-ja.texi should be included from cman.texi 
+#   (3) xxx.en and xxx.ja should be included from cman.texi
 #     and cman-en.texi
 #  cf.  glib*  base*
 ########################################################################
@@ -34,331 +36,173 @@ OpenXM_ROOT=../../../../../OpenXM
 ASIRDOC=$(OpenXM_ROOT)/src/asir-doc
 ASIRLIB=$(OpenXM_ROOT)/../OpenXM_contrib2/asir2000/lib
 CONTRIB=$(OpenXM_ROOT)/src/asir-contrib/packages/src
-OPTGENTEXI= --include 
+OPTGENTEXI= --include
 #OPTGENTEXI= --include --example
 ## PS documents are installed under $(OpenXM_doc)/asir-contrib
 OpenXM_doc=$(OpenXM_ROOT)/doc
 DVIPS=dvips -f
-OXWEAVE= ../../../kxx/oxweave
+OXWEAVE=$(OpenXM_ROOT)/bin/oxweave
 TEXI2HTML=texi2html -menu -split_node
 RM=rm
 
-JPSRCS= opening.texi oxxm-ja.texi oxmath-ja.texi oxphc-ja.texi oxgnuplot-ja.texi oxsm1-ja.texi oxom-ja.texi dsolv-ja.texi longname-ja.texi oxtigers-ja.texi names-ja.texi hypergeometric-ja.texi number-ja.texi calculus-ja.texi series-ja.texi matrix-ja.texi  graphic-ja.texi print-ja.texi poly-ja.texi complex-ja.texi intro-ja.texi Diff-ja.texi Dmodule-ja.texi  base-ja.texi misc-ja.texi glib-ja.texi pfp-ja.texi plucker-ja.texi windows-ja.texi
-EGSRCS= opening.texi oxxm-en.texi oxmath-en.texi oxphc-en.texi oxgnuplot-en.texi oxsm1-en.texi oxom-en.texi dsolv-en.texi longname-en.texi oxtigers-en.texi names-en.texi hypergeometric-en.texi number-en.texi calculus-en.texi series-en.texi matrix-en.texi  graphic-en.texi print-en.texi poly-en.texi complex-en.texi intro-en.texi cman-en.texi base-en.texi misc-en.texi glib-en.texi pfp-en.texi plucker-en.texi windows-en.texi
+SRC = base.oxweave calculus.oxweave complex.oxweave dsolv.oxweave \
+      glib.oxweave gnuplot.oxweave graphic.oxweave hypergeometric.oxweave \
+      intro.oxweave m.oxweave matrix.oxweave misc.oxweave names.oxweave \
+      number.oxweave oxrfc100.oxweave pfp.oxweave phc.oxweave \
+      plucker.oxweave poly.oxweave print.oxweave series.oxweave sm1.oxweave \
+      tigers.oxweave util.oxweave windows.oxweave 
 
-JAAUTO=base-auto-ja.texi pfp-auto-ja.texi poly-auto-ja.texi \
-       print-auto-ja.texi matrix-auto-ja.texi glib-auto-ja.texi \
-	   sm1-auto-ja.texi plucker-auto-ja.texi
-ENAUTO=base-auto-en.texi pfp-auto-en.texi poly-auto-en.texi \
-       print-auto-en.texi matrix-auto-en.texi glib-auto-en.texi \
-	   sm1-auto-en.texi plucker-auto-en.texi
+ENSRCS = ${SRC:.oxweave=.en} opening.texi oxom.en
+JASRCS = ${SRC:.oxweave=.ja} opening.texi oxom.ja Diff-ja.texi Dmodule-ja.texi
+ENAUTO=  base-auto.en glib-auto.en matrix-auto.en number-auto.en pfp-auto.en \
+         plucker-auto.en poly-auto.en print-auto.en sm1-auto.en util-auto.en 
+JAAUTO=${ENAUTO:.en=.ja}
 
-all : gentexi $(JPSRCS) $(EGSRCS) $(JAAUTO) $(ENAUTO)
+.SUFFIXES: .en .ja .oxweave
+
+.oxweave.en:
+	$(RM) -f ${<:.oxweave=.en}
+	$(OXWEAVE) C en < $< > ${<:.oxweave=.en}
+
+.oxweave.ja:
+	$(RM) -f ${<:.oxweave=.ja}
+	$(OXWEAVE) C ja < $< > ${<:.oxweave=.ja}
+
+all : gentexi $(JASRCS) $(ENSRCS) $(JAAUTO) $(ENAUTO)
 	@echo "Type in  tex cman-en.texi to generate the manual(en) in dvi format."
-	@echo "Type in  ptex cman-ja.texi   to generate the manual(ja) in dvi format."
+	@echo "Type in ptex cman-ja.texi to generate the manual(ja) in dvi format."
+
 install :
-	@if [ ! -f ./.done_install ] ; \
-	then \
+	@if [ ! -f ./.done_install ] ; then \
 		make install2 ; \
 		touch ./.done_install ; \
 	else \
 		echo "NOTE: Installation is already done. Remove .done_install for a new installation." ; \
 	fi
 
-install2 : install-document install-help install-html-help
+install-document : install-html-help
+	@if [ ! -f ./.done_install_document ] ; then \
+		make install-document2 ; \
+		touch ./.done_install_document ; \
+	else \
+		echo "NOTE: Installation of document is already done. Remove .done_install_document for a new installation." ; \
+	fi
 
+install2 : install-help
+
 gentexi : gentexi.c
 	gcc -o gentexi gentexi.c
 
-###base
-base-ja.texi : base.oxweave
-	$(RM) -f base-ja.texi
-	$(OXWEAVE) C ja  <base.oxweave >base-ja.texi
-base-en.texi : base.oxweave
-	$(RM) -f base-en.texi
-	$(OXWEAVE) C en  <base.oxweave >base-en.texi
-base-auto-en.texi : $(CONTRIB)/names.rr gentexi
-	$(RM) -f base-auto-en.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category base --en --upnode "Basic (Standard Functions)" ${OPTGENTEXI} >base-auto-en.texi
-base-auto-ja.texi : $(CONTRIB)/names.rr gentexi
-	$(RM) -f base-auto-ja.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category base --ja --upnode Top ${OPTGENTEXI} >base-auto-ja.texi
+oxom.ja : $(CONTRIB)/om
+	$(RM) -f oxom.ja
+	$(OXWEAVE) C ja  <$(CONTRIB)/om >oxom.ja
+oxom.en : $(CONTRIB)/om
+	$(RM) -f oxom.en
+	$(OXWEAVE) C en  <$(CONTRIB)/om >oxom.en
 
+### base
+base-auto.en : $(CONTRIB)/names.rr gentexi
+	$(RM) -f base-auto.en
+	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category base --en --upnode "Basic (Standard Functions)" ${OPTGENTEXI} >base-auto.en
+base-auto.ja : $(CONTRIB)/names.rr gentexi
+	$(RM) -f base-auto.ja
+	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category base --ja --upnode "Basic (Standard Functions)" ${OPTGENTEXI} >base-auto.ja
 
-names-ja.texi : names.oxweave
-	$(RM) -f names-ja.texi
-	$(OXWEAVE) C ja  <names.oxweave >names-ja.texi
+### plucker
+plucker-auto.en : $(CONTRIB)/plucker.rr gentexi
+	$(RM) -f plucker-auto.en
+	$(OXWEAVE) usage  <$(CONTRIB)/plucker.rr | ./gentexi --category plucker --en --upnode "Plucker relations" ${OPTGENTEXI} >plucker-auto.en
+plucker-auto.ja : $(CONTRIB)/plucker.rr gentexi
+	$(RM) -f plucker-auto.ja
+	$(OXWEAVE) usage  <$(CONTRIB)/plucker.rr | ./gentexi --category plucker --ja --upnode "Plucker relations" ${OPTGENTEXI} >plucker-auto.ja
 
-names-en.texi : names.oxweave
-	$(RM) -f names-en.texi
-	$(OXWEAVE) C en  <names.oxweave >names-en.texi
+### number
+number-auto.en :  $(CONTRIB)/names.rr gentexi
+	$(RM) -f number-auto.en
+	cat ${CONTRIB}/names.rr | $(OXWEAVE) usage | ./gentexi  --category number --en --upnode "Numbers (Standard Mathematical Functions)" ${OPTGENTEXI} >number-auto.en
+number-auto.ja : $(CONTRIB)/names.rr gentexi
+	$(RM) -f number-auto.ja
+	cat ${CONTRIB}/names.rr | $(OXWEAVE) usage  | ./gentexi   --category number  --ja --upnode "Numbers (Standard Mathematical Functions)" ${OPTGENTEXI} >number-auto.ja
 
-###plucker
-plucker-ja.texi : plucker.oxweave
-	$(RM) -f plucker-ja.texi
-	$(OXWEAVE) C ja  <plucker.oxweave >plucker-ja.texi
-plucker-en.texi : plucker.oxweave
-	$(RM) -f plucker-en.texi
-	$(OXWEAVE) C en  <plucker.oxweave >plucker-en.texi
-plucker-auto-en.texi : $(CONTRIB)/plucker.rr gentexi
-	$(RM) -f plucker-auto-en.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/plucker.rr | ./gentexi --category plucker --en --upnode "Plucker relations" ${OPTGENTEXI} >plucker-auto-en.texi
-plucker-auto-ja.texi : $(CONTRIB)/plucker.rr gentexi
-	$(RM) -f plucker-auto-ja.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/plucker.rr | ./gentexi --category plucker --ja --upnode Top ${OPTGENTEXI} >plucker-auto-ja.texi
-
-hypergeometric-ja.texi : hypergeometric.oxweave
-	$(RM) -f hypergeometric-ja.texi
-	$(OXWEAVE) C ja  <hypergeometric.oxweave >hypergeometric-ja.texi
-
-hypergeometric-en.texi : hypergeometric.oxweave
-	$(RM) -f hypergeometric-en.texi
-	$(OXWEAVE) C en  <hypergeometric.oxweave >hypergeometric-en.texi
-
-number-ja.texi : number.oxweave
-	$(RM) -f number-ja.texi
-	$(OXWEAVE) C ja  <number.oxweave >number-ja.texi
-
-number-en.texi : number.oxweave
-	$(RM) -f number-en.texi
-	$(OXWEAVE) C en  <number.oxweave >number-en.texi
-
-calculus-ja.texi : calculus.oxweave
-	$(RM) -f calculus-ja.texi
-	$(OXWEAVE) C ja  <calculus.oxweave >calculus-ja.texi
-
-calculus-en.texi : calculus.oxweave
-	$(RM) -f calculus-en.texi
-	$(OXWEAVE) C en  <calculus.oxweave >calculus-en.texi
-
-series-ja.texi : series.oxweave
-	$(RM) -f series-ja.texi
-	$(OXWEAVE) C ja  <series.oxweave >series-ja.texi
-
-series-en.texi : series.oxweave
-	$(RM) -f series-en.texi
-	$(OXWEAVE) C en  <series.oxweave >series-en.texi
-
 ### matrix
-matrix-ja.texi : matrix.oxweave
-	$(RM) -f matrix-ja.texi
-	$(OXWEAVE) C ja  <matrix.oxweave >matrix-ja.texi
-matrix-en.texi : matrix.oxweave
-	$(RM) -f matrix-en.texi
-	$(OXWEAVE) C en  <matrix.oxweave >matrix-en.texi
-matrix-auto-en.texi : $(CONTRIB)/names.rr gentexi
-	$(RM) -f matrix-auto-en.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category matrix --en --upnode "Matrix (Standard Mathematical Functions)" ${OPTGENTEXI} >matrix-auto-en.texi
-matrix-auto-ja.texi : $(CONTRIB)/names.rr gentexi
-	$(RM) -f matrix-auto-ja.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category matrix --ja --upnode Top ${OPTGENTEXI} >matrix-auto-ja.texi
+matrix-auto.en : $(CONTRIB)/names.rr gentexi
+	$(RM) -f matrix-auto.en
+	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category matrix --en --upnode "Matrix (Standard Mathematical Functions)" ${OPTGENTEXI} >matrix-auto.en
+matrix-auto.ja : $(CONTRIB)/names.rr gentexi
+	$(RM) -f matrix-auto.ja
+	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category matrix --ja --upnode "Matrix (Standard Mathematical Functions)" ${OPTGENTEXI} >matrix-auto.ja
 
-
-graphic-ja.texi : graphic.oxweave
-	$(RM) -f graphic-ja.texi
-	$(OXWEAVE) C ja  <graphic.oxweave >graphic-ja.texi
-
-graphic-en.texi : graphic.oxweave
-	$(RM) -f graphic-en.texi
-	$(OXWEAVE) C en  <graphic.oxweave >graphic-en.texi
-
 ### print
-print-ja.texi : print.oxweave
-	$(RM) -f print-ja.texi
-	$(OXWEAVE) C ja  <print.oxweave >print-ja.texi
-print-en.texi : print.oxweave
-	$(RM) -f print-en.texi
-	$(OXWEAVE) C en  <print.oxweave >print-en.texi
-print-auto-en.texi : $(CONTRIB)/names.rr gentexi
-	$(RM) -f print-auto-en.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category print --en --upnode "Print (Standard Mathematical Functions)" ${OPTGENTEXI} >print-auto-en.texi
-print-auto-ja.texi : $(CONTRIB)/names.rr gentexi
-	$(RM) -f print-auto-ja.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category print --ja --upnode Top ${OPTGENTEXI} >print-auto-ja.texi
+print-auto.en : $(CONTRIB)/names.rr gentexi
+	$(RM) -f print-auto.en
+	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category print --en --upnode "Print (Standard Mathematical Functions)" ${OPTGENTEXI} >print-auto.en
+print-auto.ja : $(CONTRIB)/names.rr gentexi
+	$(RM) -f print-auto.ja
+	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category print --ja --upnode "Print (Standard Mathematical Functions)" ${OPTGENTEXI} >print-auto.ja
 
-###poly
-poly-ja.texi : poly.oxweave
-	$(RM) -f poly-ja.texi
-	$(OXWEAVE) C ja  <poly.oxweave >poly-ja.texi
-poly-en.texi : poly.oxweave
-	$(RM) -f poly-en.texi
-	$(OXWEAVE) C en  <poly.oxweave >poly-en.texi
-poly-auto-en.texi : $(CONTRIB)/names.rr gentexi
-	$(RM) -f poly-auto-en.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category poly --en --upnode "Polynomials (Standard Mathematical Functions)" ${OPTGENTEXI} >poly-auto-en.texi
-poly-auto-ja.texi : $(CONTRIB)/names.rr gentexi
-	$(RM) -f poly-auto-ja.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category poly --ja --upnode Top ${OPTGENTEXI} >poly-auto-ja.texi
+### poly
+poly-auto.en : $(CONTRIB)/names.rr gentexi
+	$(RM) -f poly-auto.en
+	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category poly --en --upnode "Polynomials (Standard Mathematical Functions)" ${OPTGENTEXI} >poly-auto.en
+poly-auto.ja : $(CONTRIB)/names.rr gentexi
+	$(RM) -f poly-auto.ja
+	$(OXWEAVE) usage  <$(CONTRIB)/names.rr | ./gentexi --category poly --ja --upnode "Polynomials (Standard Mathematical Functions)" ${OPTGENTEXI} >poly-auto.ja
+### sm1
+sm1-auto.en : $(CONTRIB)/sm1 gentexi
+	$(RM) -f sm1-auto.en
+	$(OXWEAVE) usage  <$(CONTRIB)/sm1 | ./gentexi --category sm1 --en --upnode "SM1 Functions" ${OPTGENTEXI} >sm1-auto.en
+sm1-auto.ja : $(CONTRIB)/sm1 gentexi
+	$(RM) -f sm1-auto.ja
+	$(OXWEAVE) usage  <$(CONTRIB)/sm1 | ./gentexi --category sm1 --ja --upnode "SM1 Functions" ${OPTGENTEXI} >sm1-auto.ja
 
-complex-ja.texi : complex.oxweave
-	$(RM) -f complex-ja.texi
-	$(OXWEAVE) C ja  <complex.oxweave >complex-ja.texi
+### glib
+glib-auto.en : ${ASIRLIB}/glib gentexi
+	$(RM) -f glib-auto.en
+	cat ${ASIRLIB}/glib | $(OXWEAVE) usage | ./gentexi  --category glib --en --upnode "Graphic Library (2 dimensional)" ${OPTGENTEXI} >glib-auto.en
+glib-auto.ja : ${ASIRLIB}/glib gentexi
+	$(RM) -f glib-auto.ja
+	cat ${ASIRLIB}/glib | $(OXWEAVE) usage  | ./gentexi   --category glib  --ja --upnode "Graphic Library (2 dimensional)" ${OPTGENTEXI} >glib-auto.ja
 
-complex-en.texi : complex.oxweave
-	$(RM) -f complex-en.texi
-	$(OXWEAVE) C en  <complex.oxweave >complex-en.texi
+### pfp
+pfp-auto.en : $(CONTRIB)/pfpcoh.rr $(CONTRIB)/pfphom.rr gentexi
+	$(RM) -f pfp-auto.en
+	cat $(CONTRIB)/pfpcoh.rr $(CONTRIB)/pfphom.rr | $(OXWEAVE) usage | ./gentexi  --en --upnode  Pfpcohom ${OPTGENTEXI} >pfp-auto.en
+pfp-auto.ja : $(CONTRIB)/pfpcoh.rr $(CONTRIB)/pfphom.rr gentexi
+	$(RM) -f pfp-auto.ja
+	cat $(CONTRIB)/pfpcoh.rr $(CONTRIB)/pfphom.rr | $(OXWEAVE) usage  | ./gentexi  --ja --upnode Pfpcohom ${OPTGENTEXI} >pfp-auto.ja
 
+### util
+util-auto.en :  $(CONTRIB)/names.rr gentexi
+	$(RM) -f util-auto.en
+	cat ${CONTRIB}/names.rr | $(OXWEAVE) usage | ./gentexi  --category util --en --upnode "Utility Functions" ${OPTGENTEXI} >util-auto.en
+util-auto.ja : $(CONTRIB)/names.rr gentexi
+	$(RM) -f util-auto.ja
+	cat ${CONTRIB}/names.rr | $(OXWEAVE) usage  | ./gentexi   --category util  --ja --upnode "Utility Functions" ${OPTGENTEXI} >util-auto.ja
 
-oxxm-ja.texi : $(ASIRLIB)/xm Makefile
-	$(RM) -f oxxm-ja.texi
-	$(OXWEAVE) C-texi jp-texi  <$(ASIRLIB)/xm >oxxm-ja.texi
+### Generating online manual
+gen-help-en: $(ENSRCS) $(ASIRDOC)/extract_func $(ENAUTO)
+	-$(RM) -rf tmp-en help-en
+	mkdir help-en tmp-en
+	cp cman-en.texi $(ENSRCS) $(ENAUTO) tmp-en
+	-(cd tmp-en; makeinfo --force cman-en.texi)
+	(cd help-en; for i in ../tmp-en/asir-contrib*; do ../$(ASIRDOC)/extract_func $$i; done)
 
-oxxm-en.texi : $(ASIRLIB)/xm Makefile
-	$(RM) -f oxxm-en.texi
-	$(OXWEAVE) C-texi eg-texi  <$(ASIRLIB)/xm >oxxm-en.texi
-
-oxmath-ja.texi : $(CONTRIB)/m Makefile
-	$(RM) -f oxmath-ja.texi
-	$(OXWEAVE) C-texi jp-texi  <$(CONTRIB)/m >oxmath-ja.texi
-
-oxmath-en.texi : $(CONTRIB)/m Makefile
-	$(RM) -f oxmath-en.texi
-	$(OXWEAVE) C-texi eg-texi  <$(CONTRIB)/m >oxmath-en.texi
-
-oxphc-ja.texi : $(CONTRIB)/phc Makefile
-	$(RM) -f oxphc-ja.texi
-	$(OXWEAVE) C-texi jp-texi  <$(CONTRIB)/phc >oxphc-ja.texi
-
-oxphc-en.texi : $(CONTRIB)/phc Makefile
-	$(RM) -f oxphc-en.texi
-	$(OXWEAVE) C-texi eg-texi  <$(CONTRIB)/phc >oxphc-en.texi
-
-oxgnuplot-ja.texi : $(CONTRIB)/gnuplot Makefile
-	$(RM) -f oxgnuplot-ja.texi
-	$(OXWEAVE) C-texi jp-texi  <$(CONTRIB)/gnuplot >oxgnuplot-ja.texi
-
-oxgnuplot-en.texi : $(CONTRIB)/gnuplot Makefile
-	$(RM) -f oxgnuplot-en.texi
-	$(OXWEAVE) C-texi eg-texi  <$(CONTRIB)/gnuplot >oxgnuplot-en.texi
-
-###sm1
-oxsm1-ja.texi : sm1.oxweave Makefile sm1-auto-ja.texi
-	$(RM) -f oxsm1-ja.texi
-	$(OXWEAVE) C-texi jp-texi  <sm1.oxweave >oxsm1-ja.texi
-oxsm1-en.texi : sm1.oxweave Makefile sm1-auto-en.texi
-	$(RM) -f oxsm1-en.texi
-	$(OXWEAVE) C-texi eg-texi  <sm1.oxweave >oxsm1-en.texi
-sm1-auto-en.texi : $(CONTRIB)/sm1 gentexi
-	$(RM) -f sm1-auto-en.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/sm1 | ./gentexi --category sm1 --en --upnode "SM1 Functions" ${OPTGENTEXI} >sm1-auto-en.texi
-sm1-auto-ja.texi : $(CONTRIB)/names.rr gentexi
-	$(RM) -f sm1-auto-ja.texi
-	$(OXWEAVE) usage  <$(CONTRIB)/sm1 | ./gentexi --category sm1 --ja --upnode Top ${OPTGENTEXI} >sm1-auto-ja.texi
-
-oxom-ja.texi : $(CONTRIB)/om Makefile
-	$(RM) -f oxom-ja.texi
-	$(OXWEAVE) C-texi jp-texi  <$(CONTRIB)/om >oxom-ja.texi
-
-oxom-en.texi : $(CONTRIB)/om Makefile
-	$(RM) -f oxom-en.texi
-	$(OXWEAVE) C-texi eg-texi  <$(CONTRIB)/om >oxom-en.texi
-
-dsolv-ja.texi : dsolv.oxweave Makefile
-	$(RM) -f dsolv-ja.texi
-	$(OXWEAVE) C-texi jp-texi  <dsolv.oxweave >dsolv-ja.texi
-
-dsolv-en.texi : dsolv.oxweave Makefile
-	$(RM) -f dsolv-en.texi
-	$(OXWEAVE) C-texi eg-texi  <dsolv.oxweave >dsolv-en.texi
-
-longname-ja.texi : $(CONTRIB)/longname Makefile
-	$(RM) -f longname-ja.texi
-	$(OXWEAVE) C-texi jp-texi  <$(CONTRIB)/longname >longname-ja.texi
-
-longname-en.texi : $(CONTRIB)/longname Makefile
-	$(RM) -f longname-en.texi
-	$(OXWEAVE) C-texi eg-texi  <$(CONTRIB)/longname >longname-en.texi
-
-oxtigers-ja.texi : $(CONTRIB)/tigers Makefile
-	$(RM) -f oxtigers-ja.texi
-	$(OXWEAVE) C-texi jp-texi  <$(CONTRIB)/tigers >oxtigers-ja.texi
-
-oxtigers-en.texi : $(CONTRIB)/tigers Makefile
-	$(RM) -f oxtigers-en.texi
-	$(OXWEAVE) C-texi eg-texi  <$(CONTRIB)/tigers >oxtigers-en.texi
-
-### windows
-windows-ja.texi : windows.oxweave Makefile
-	$(RM) -f windows-ja.texi
-	$(OXWEAVE) C-texi ja  <windows.oxweave >windows-ja.texi
-
-windows-en.texi : windows.oxweave Makefile
-	$(RM) -f windows-en.texi
-	$(OXWEAVE) C-texi en  <windows.oxweave >windows-en.texi
-
-### intro
-intro-ja.texi : intro.oxweave Makefile
-	$(RM) -f intro-ja.texi
-	$(OXWEAVE) C-texi ja  <intro.oxweave >intro-ja.texi
-
-intro-en.texi : intro.oxweave Makefile
-	$(RM) -f intro-en.texi
-	$(OXWEAVE) C-texi en  <intro.oxweave >intro-en.texi
-
-###misc
-misc-ja.texi : misc.oxweave
-	$(RM) -f misc-ja.texi
-	$(OXWEAVE) C ja  <misc.oxweave >misc-ja.texi
-misc-en.texi : misc.oxweave
-	$(RM) -f misc-en.texi
-	$(OXWEAVE) C en  <misc.oxweave >misc-en.texi
-
-###glib
-glib-ja.texi : glib.oxweave
-	$(RM) -f glib-ja.texi
-	$(OXWEAVE) C ja  <glib.oxweave >glib-ja.texi
-glib-en.texi : glib.oxweave
-	$(RM) -f glib-en.texi
-	$(OXWEAVE) C en  <glib.oxweave >glib-en.texi
-glib-auto-en.texi : ${ASIRLIB}/glib gentexi
-	$(RM) -f glib-auto-en.texi
-	cat ${ASIRLIB}/glib | $(OXWEAVE) usage | ./gentexi  --category glib --en --upnode "Graphic Library (2 dimensional)" ${OPTGENTEXI} >glib-auto-en.texi
-glib-auto-ja.texi : ${ASIRLIB}/glib gentexi
-	$(RM) -f glib-auto-ja.texi
-	cat ${ASIRLIB}/glib | $(OXWEAVE) usage  | ./gentexi   --category glib  --ja --upnode Top ${OPTGENTEXI} >glib-auto-ja.texi
-
-###pfp
-pfp-ja.texi : pfp.oxweave
-	$(RM) -f pfp-ja.texi
-	$(OXWEAVE) C ja  <pfp.oxweave >pfp-ja.texi
-pfp-en.texi : pfp.oxweave
-	$(RM) -f pfp-en.texi
-	$(OXWEAVE) C en  <pfp.oxweave >pfp-en.texi
-pfp-auto-en.texi : $(CONTRIB)/pfpcoh.rr $(CONTRIB)/pfphom.rr gentexi
-	$(RM) -f pfp-auto-en.texi
-	cat $(CONTRIB)/pfpcoh.rr $(CONTRIB)/pfphom.rr | $(OXWEAVE) usage | ./gentexi  --en --upnode  Pfpcohom ${OPTGENTEXI} >pfp-auto-en.texi
-pfp-auto-ja.texi : $(CONTRIB)/pfpcoh.rr $(CONTRIB)/pfphom.rr gentexi
-	$(RM) -f pfp-auto-ja.texi
-	cat $(CONTRIB)/pfpcoh.rr $(CONTRIB)/pfphom.rr | $(OXWEAVE) usage  | ./gentexi  --ja --upnode Top ${OPTGENTEXI} >pfp-auto-ja.texi
-
-###### Generating online manual
-gen-help-en: $(EGSRCS) $(ASIRDOC)/extract_func $(ENAUTO)
-	-$(RM) -rf tmp help-en
-	mkdir help-en tmp
-	cp cman-en.texi $(EGSRCS) $(ENAUTO) tmp
-	-(cd tmp; makeinfo --force cman-en.texi)
-	(cd help-en; for i in ../tmp/asir-contrib*; do ../$(ASIRDOC)/extract_func $$i; done)
-## duplicate some help files
-	-(cd help-en; cp sm1_hilbert hilbert_polynomial)
-
-gen-help-ja: $(JPSRCS) $(ASIRDOC)/extract_func $(JAAUTO)
+gen-help-ja: $(JASRCS) $(ASIRDOC)/extract_func $(JAAUTO)
 	-$(RM) -rf tmp-ja help-ja
 	mkdir help-ja tmp-ja
-	for i in cman-ja.texi $(JPSRCS) $(JAAUTO); do nkf -e $$i > tmp-ja/$$i; done
+	for i in cman-ja.texi $(JASRCS) $(JAAUTO); do nkf -e $$i > tmp-ja/$$i; done
 	-(cd tmp-ja; makeinfo --force cman-ja.texi)
 	(cd help-ja; for i in ../tmp-ja/asir-contrib*; do ../$(ASIRDOC)/extract_func -j $$i; done)
-## duplicate some help files
-	-(cd help-ja; cp sm1_hilbert hilbert_polynomial)
 
 gen-html-en: gen-help-en
 	-$(RM) -rf html-en
 	-mkdir html-en
-	-cp tmp/*.texi html-en
+	-cp tmp-en/*.texi tmp-en/*.en html-en
 	-(cd html-en; ${TEXI2HTML} cman-en.texi)
 
 gen-html-ja: gen-help-ja
 	-mkdir html-ja
-	-cp tmp-ja/*.texi html-ja
+	-cp tmp-ja/*.texi tmp-ja/*.ja html-ja
 	-cp tmp-ja/cman-ja.texi html-ja/cman-ja.texi
 	-(cd html-ja; ${TEXI2HTML} cman-ja.texi)
 
@@ -373,32 +217,33 @@ install-help: help
 	-cp -f help-en/* $(OpenXM_ROOT)/lib/asir/help-eg/xm.help
 
 install-html-help: gen-html-en gen-html-ja
+	-mkdir $(OpenXM_doc)/asir-contrib
 	-( tar cf - html-en | (cd $(OpenXM_doc)/asir-contrib ; tar xf -))
 	-( tar cf - html-ja | (cd $(OpenXM_doc)/asir-contrib ; tar xf -))
 
-install-document :  gen-dvi-ps
+install-document2 :  gen-dvi-ps
+	-mkdir $(OpenXM_doc)/asir-contrib
 	-cp cman-ja.dvi $(OpenXM_doc)/asir-contrib/cman-ja.dvi
 	-$(DVIPS) cman-ja >$(OpenXM_doc)/asir-contrib/cman-ja.ps
 	-cp cman-en.dvi $(OpenXM_doc)/asir-contrib/cman-en.dvi
 	-$(DVIPS) cman-en >$(OpenXM_doc)/asir-contrib/cman-en.ps
 gen-dvi-ps: all clean-mk-openxm-asir-contrib-document-dir cman-ja.dvi cman-en.dvi
-cman-ja.dvi: $(JPSRCS)
+cman-ja.dvi: $(JASRCS)
 	-ptex cman-ja.texi
 	-ptex cman-ja.texi
 cman-en.dvi: $(ENSRCS)
 	-tex cman-en.texi
 	-tex cman-en.texi
 
-
 clean-mk-openxm-asir-contrib-document-dir :
 	$(RM) -rf $(OpenXM_doc)/asir-contrib
-	$(RM) -f ./.done_install
+	$(RM) -f ./.done_install ./.done_install_document
 	mkdir $(OpenXM_doc)/asir-contrib
 	touch $(OpenXM_doc)/asir-contrib/DO_NOT_EDIT_THIS_DIRECTORY._ALL_FILES_ARE_AUTOMATICDALLY_GENERATED.
 
-
 clean :
-	$(RM) -f ./.done_install
+	$(RM) -f ./.done_install ./.done_install_document
 	$(RM) -f gentexi $(JAAUTO) $(ENAUTO) gentexi-in.tmp gentexi-out.tmp
-	$(RM) -f oxxm-ja.texi oxxm-en.texi oxmath-ja.texi *~ *.aux *.cp *.dvi *.fn *.ky *.log *.pg *.toc *.tp *.vr oxmath-en.texi oxphc-ja.texi oxphc-en.texi oxgnuplot-ja.texi oxgnuplot-en.texi oxsm1-ja.texi oxsm1-en.texi oxom-en.texi oxom-ja.texi dsolv-ja.texi dsolv-en.texi longname-ja.texi longname-en.texi oxtigers-ja.texi oxtigers-en.texi names-ja.texi names-en.texi hypergeometric-ja.texi hypergeometric-en.texi number-en.texi number-ja.texi calculus-en.texi calculus-ja.texi series-en.texi series-ja.texi matrix-en.texi matrix-ja.texi graphic-en.texi graphic-ja.texi print-en.texi print-ja.texi poly-en.texi poly-ja.texi complex-en.texi complex-ja.texi plucker-ja.texi plucker-en.texi base-ja.texi base-en.texi glib-ja.texi glib-en.texi misc-ja.texi misc-en.texi pfp-ja.texi pfp-en.texi windows-ja.texi windows-en.texi intro-ja.texi intro-en.texi
-	$(RM) -rf help-ja help-en tmp tmp-ja html-en html-ja
+	$(RM) -f *.aux *.cp *.dvi *.fn *.ky *.log *.pg *.toc *.tp *.vr *~
+	$(RM) -f  *.en *.ja
+	$(RM) -rf help-ja help-en tmp-en tmp-ja html-en html-ja