X-Git-Url: http://git.chise.org/gitweb/?p=m17n%2Fm17n-docs.git;a=blobdiff_plain;f=Makefile.am;h=0a85b046e5d62a26385c13570ccb3e45b032e4b2;hp=3199b08365b7f530eec054c6e25d8885f3421155;hb=8cbc94d3539b3eb0f3011151b4248f15992a295c;hpb=040f97e25c3c541ac88cfd9e57d7d16867f5be7d

diff --git a/Makefile.am b/Makefile.am
index 3199b08..0a85b04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@
 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
 
@@ -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; \
@@ -84,7 +84,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}
@@ -93,11 +93,9 @@ SRCALL = \
 	mainpage.txt \
 	${MAN3} \
 	data/m17n-config.txt data/exprog.txt data/exmim.txt data/dbformat.txt \
-	data/db-mim.txt data/db-flt.txt
-
-DB_MIM = $(shell echo @M17NDB@/*.mim)
+	data/dbdata.txt
 
-DB_FLT = $(shell echo @M17NDB@/*.flt)
+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
@@ -117,8 +115,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}
@@ -134,7 +132,7 @@ 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 Makefile
 	sed -e 's|%PROJECT_NUMBER%|@PACKAGE_VERSION@|' \
 	    -e 's|%INPUT%|${SRCALL}|' \
 	    -e 's|%GENERATE_HTML%|YES|' \
@@ -225,11 +223,8 @@ data/exprog.txt: ${EXAMPLE_PROGS} utils/exprog.sh
 data/exmim.txt: ${EXAMPLE_MIMS} utils/exmim.sh
 	utils/exmim.sh ${EXAMPLE_MIMS} > $@
 
-data/db-mim.txt: ${DB_MIM} utils/db-mim.sh
-	utils/db-mim.sh ${DB_MIM} > $@
-
-data/db-flt.txt: ${DB_FLT} utils/db-flt.sh
-	utils/db-flt.sh ${DB_FLT} > $@
+data/dbdata.txt: ${DBDATA} utils/dbdata.awk
+	@AWK@ -f utils/dbdata.awk @M17NDB@/mdb.dir > $@
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
 	utils/dbformat.sh ${DBFORMAT}/*.txt > $@
@@ -268,7 +263,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} $<