X-Git-Url: http://git.chise.org/gitweb/?p=m17n%2Fm17n-docs.git;a=blobdiff_plain;f=Makefile.am;h=21935614cc231b17007ca2dd419ed77aa5a3a5dd;hp=2f9576c8b520b2967c70aba9a55c51c15c4f8675;hb=754a32a2973d5e8ebb1bc32d034e18ba621b4194;hpb=cea45781a047bf922e23002883a9bf1e57bd0712

diff --git a/Makefile.am b/Makefile.am
index 2f9576c..2193561 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,11 +26,11 @@
 pkgdata_DATA = \
 	usr/html/index.html \
 	usr/latex/m17n-lib.dvi usr/latex/m17n-lib.ps \
-	man/man1/m17nconfig.1 \
+	man/man1/m17n-config.1 \
 	man/man3/m17nIntro.3m17n \
 	man/man5/mdbGeneral.5
 
-pkgdatadir = $(datadir)/m17n-lib
+pkgdatadir = $(datadir)/m17n/docs
 
 EXTRA_DIST = usr/html usr/latex/m17n-lib.dvi usr/latex/m17n-lib.ps \
 	man/man1 man/man3 man/man5
@@ -41,9 +41,9 @@ install-pkgdataDATA: $(pkgdata_DATA)
 	$(INSTALL_DATA) usr/latex/m17n-lib.dvi $(pkgdatadir)/m17n-lib.dvi
 	$(INSTALL_DATA) usr/latex/m17n-lib.ps $(pkgdatadir)/m17n-lib.ps
 	cd usr/html; \
-	  for f in *.html; do $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; done
-	cd usr/html; \
-	  for f in *.png; do $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; done
+	  for f in *.html *.png; do \
+	    $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; \
+	  done
 	cd man/man1; \
 	  for f in *.1; do $(INSTALL_DATA) $$f $(mandir)/man1/$$f; done
 	cd man/man3; \
@@ -56,8 +56,8 @@ install-pkgdataDATA: $(pkgdata_DATA)
 #
 if MAINTAINER_MODE
 
-PROJECT_NAME_EN = "The M17N Library"
-PROJECT_NAME_JA = "M17N ¥é¥¤¥Ö¥é¥ê"
+PROJECT_NAME_EN = "The m17n Library"
+PROJECT_NAME_JA = "m17n ¥é¥¤¥Ö¥é¥ê"
 PROJECT_VERSION = @PACKAGE_VERSION@
 
 DOXYGEN = doxygen
@@ -71,10 +71,6 @@ EXAMPLE_PROGS = \
 	@M17NLIB@/example/mimx-anthy.c \
 	@M17NLIB@/example/mimx-ispell.c
 
-EXAMPLE_MIMS = \
-	@M17NLIB@/example/anthy.mim \
-	@M17NLIB@/example/ispell.mim
-
 DBFORMAT = \
 	@M17NDB@/FORMATS
 
@@ -84,7 +80,7 @@ MAN3 =	@M17NLIB@/src/m17n-core.h \
 	@M17NLIB@/src/m17n.h \
 	@M17NLIB@/src/m17n-gui.h \
 	@M17NLIB@/src/m17n-X.h \
-	@M17NLIB@/src/m17n-err.h \
+	@M17NLIB@/src/m17n-misc.h \
 	@M17NLIB@/src
 
 MAN5 = ${DBFORMAT}
@@ -92,7 +88,10 @@ MAN5 = ${DBFORMAT}
 SRCALL = \
 	mainpage.txt \
 	${MAN3} \
-	data/m17n-config.txt data/exprog.txt data/exmim.txt data/dbformat.txt
+	data/m17n-config.txt data/exprog.txt data/dbformat.txt \
+	data/dbdata.txt fdl.txt
+
+DBDATA = $(shell echo @M17NDB@/*.{dir,mim,flt,fst,tbl})
 
 HTML_USR_TARGET = usr/html/index.html usr/html/parrot.png
 HTML_JA_TARGET = ja/html/index.html ja/html/parrot.png
@@ -112,8 +111,8 @@ usr-latex latex-usr: ${LATEX_USR_TARGET}
 ja-latex latex-ja: ${LATEX_JA_TARGET}
 dev-latex latex-dev: ${LATEX_DEV_TARGET}
 
-MAN_USR_TARGET = man/man1/m17n-config.1 man/man3/m17nIntro.3m17n man/man5/m17nDBgeneral.5
-MAN_JA_TARGET = man/ja/man1/m17n-config.1 man/ja/man3/m17nIntro.3m17n man/ja/man5/m17nDatabaseFormat.5
+MAN_USR_TARGET = man/man1/m17n-config.1 man/man3/m17nIntro.3m17n man/man5/mdbGeneral.5
+MAN_JA_TARGET = man/ja/man1/m17n-config.1 man/ja/man3/m17nIntro.3m17n man/ja/man5/mdbGeneral.5
 MAN_TARGET = ${MAN_USR_TARGET} ${MAN_JA_TARGET}
 
 usr-man man-usr: ${MAN_USR_TARGET}
@@ -129,12 +128,13 @@ html: usr-html ja-html dev-html
 latex: usr-latex ja-latex dev-latex
 man: usr-man ja-man
 
-doxyfile-html: doxyfile
+doxyfile-html: doxyfile ${SRCALL}
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${SRCALL}|' \
 	    -e 's|%GENERATE_HTML%|YES|' \
 	    -e 's|%GENERATE_LATEX%|NO|' \
 	    -e 's|%GENERATE_MAN%|NO|' \
+	    -e 's|%ENABLED_SECTIONS%|FOR-HTML|' \
 	  < $< >$@
 
 doxyfile-html.usr: doxyfile-html
@@ -155,12 +155,13 @@ doxyfile-html.ja: doxyfile-html
 	    -e 's/%OUTPUT_LANGUAGE%/Japanese/' \
 	  < $< >$@
 
-doxyfile-latex: doxyfile
+doxyfile-latex: doxyfile ${SRCALL}
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${SRCALL}|' \
 	    -e 's|%GENERATE_HTML%|NO|' \
 	    -e 's|%GENERATE_LATEX%|YES|' \
 	    -e 's|%GENERATE_MAN%|NO|' \
+	    -e 's|%ENABLED_SECTIONS%|FOR-LATEX|' \
 	  < $< >$@
 
 doxyfile-latex.usr: doxyfile-latex
@@ -181,31 +182,34 @@ doxyfile-latex.ja: doxyfile-latex
 	    -e 's/%OUTPUT_LANGUAGE%/Japanese/' \
 	  < $< >$@
 
-doxyfile-man1: doxyfile
+doxyfile-man1: doxyfile ${SRCALL}
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${MAN1}|' \
 	    -e 's|%GENERATE_HTML%|NO|' \
 	    -e 's|%GENERATE_LATEX%|NO|' \
 	    -e 's|%GENERATE_MAN%|YES|' \
 	    -e 's|%MAN_EXTENSION%|.1|' \
+	    -e 's|%ENABLED_SECTIONS%|FOR-MAN|' \
 	  < $< >$@
 
-doxyfile-man3: doxyfile
+doxyfile-man3: doxyfile ${SRCALL}
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${MAN3}|' \
 	    -e 's|%GENERATE_HTML%|NO|' \
 	    -e 's|%GENERATE_LATEX%|NO|' \
 	    -e 's|%GENERATE_MAN%|YES|' \
 	    -e 's|%MAN_EXTENSION%|.3m17n|' \
+	    -e 's|%ENABLED_SECTIONS%|FOR-MAN|' \
 	  < $< >$@
 
-doxyfile-man5: doxyfile
+doxyfile-man5: doxyfile ${SRCALL}
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${MAN5}|' \
 	    -e 's|%GENERATE_HTML%|NO|' \
 	    -e 's|%GENERATE_LATEX%|NO|' \
 	    -e 's|%GENERATE_MAN%|YES|' \
 	    -e 's|%MAN_EXTENSION%|.5|' \
+	    -e 's|%ENABLED_SECTIONS%|FOR-MAN|' \
 	  < $< >$@
 
 doxyfile-man%.usr: doxyfile-man%
@@ -217,8 +221,8 @@ doxyfile-man%.usr: doxyfile-man%
 data/exprog.txt: ${EXAMPLE_PROGS} utils/exprog.sh
 	utils/exprog.sh ${EXAMPLE_PROGS} > $@
 
-data/exmim.txt: ${EXAMPLE_MIMS} utils/exmim.sh
-	utils/exmim.sh ${EXAMPLE_MIMS} > $@
+data/dbdata.txt: ${DBDATA} @M17NDB@/mdb.dir utils/dbdata.awk
+	@AWK@ -f utils/dbdata.awk @M17NDB@/mdb.dir > $@
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
 	utils/dbformat.sh ${DBFORMAT}/*.txt > $@
@@ -239,7 +243,7 @@ data/m17n-config.txt: @M17NLIB@/m17n-config.in
 	rm -rf `dirname $@`
 	${DOXYGEN} $<
 
-%/latex/m17n-lib.dvi: %/latex/refman.tex data-%/m17n-lib.sty utils/latex.sh
+%/latex/m17n-lib.dvi: %/latex/refman.tex styles/m17n-lib.sty utils/latex.sh
 	utils/latex.sh `dirname $@` latex
 
 %/latex/m17n-lib.ps: %/latex/m17n-lib.dvi utils/dvips.sh
@@ -257,7 +261,7 @@ data/m17n-config.txt: @M17NLIB@/m17n-config.in
 	rm -rf `dirname $@`
 	${DOXYGEN} $<
 
-%/man/man5/m17nDBgeneral.5: doxyfile-man5.% ${MAN5} utils/%_filter.rb
+%/man/man5/mdbGeneral.5: doxyfile-man5.% ${MAN5} utils/%_filter.rb
 	rm -rf `dirname $@`
 	${DOXYGEN} $<
 
@@ -309,13 +313,15 @@ CLEANFILES=doxyfile-* ${TARGET} *.tar.gz warning *~
 clean-local:
 	rm -rf usr dev ja man doxywork
 
-WEBDIR = /project/web/extra/m17n-lib/m17n-docs
-FTPDIR = /ftp/pub/m17n-lib
+WEBDIR = /project/web/extra/m17n-lib
 
 release: dist
-	[ -d ${WEBDIR} ] || mkdir ${WEBDIR}
-	cp usr/html/* ${WEBDIR}
-	cp ${distdir}.tar.gz ${FTPDIR}
+	[ -d ${WEBDIR}/m17n-docs ] || mkdir ${WEBDIR}/m17n-docs
+	[ -d ${WEBDIR}/download ] || mkdir ${WEBDIR}/download
+	cd usr/html; for f in *; do \
+	  case $$f in *8c*);; *8h*);; *8txt*);; *) cp $$f ${WEBDIR}/m17n-docs;; esac; \
+	done
+	cp ${distdir}.tar.gz ${WEBDIR}/download
 
 
 .PRECIOUS: %/latex/refman.tex %/man/man3/m17nIntro.3m ${SRCALL}