doc/Makefile.am | 334 +++++++++++++++++++++++------------------------
fc-case/Makefile.am | 3
fc-glyphname/Makefile.am | 3
fc-lang/Makefile.am | 3
4 files changed, 179 insertions(+), 164 deletions(-)
New commits:
commit 353f7cc69184cdb1a7d5b4cc00741fab97b32f17
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Mar 9 17:33:03 2012 +0900
Fix distcheck error
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a29ba2f..06ec5e9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
#
# fontconfig/doc/Makefile.am
#
@@ -21,183 +22,188 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-DOC_SRC = $(srcdir)
-DOC_MODULE = fontconfig
+NULL =
+EXTRA_DIST = \
+ $(BUILT_DOCS) \
+ $(DOC_FUNCS_FNCS) \
+ $(DOC_FUNCS_SGML) \
+ $(HTML_DIR)/* \
+ $(SGML_FILES) \
+ $(check_SCRIPTS) \
+ confdir.sgml.in \
+ func.sgml \
+ $(NULL)
+MAINTAINERCLEANFILES = \
+ $(DOC_FUNCS_SGML) \
+ $(NULL)
+CLEANFILES = \
+ $(BUILT_DOCS) \
+ $(LOCAL_SGML_FILES) \
+ confdir.sgml \
+ func.refs \
+ $(NULL)
+BUILT_SOURCES = \
+ $(NULL)
+SUFFIXES = \
+ .fncs \
+ .sgml \
+ .txt \
+ .html \
+ $(NULL)
+TESTS = \
+ check-missing-doc \
+ $(NULL)
+TESTS_ENVIRONMENT=top_srcdir=${top_srcdir} sh
+#
DOC2HTML = docbook2html
-DOC2TXT = docbook2txt
-DOC2MAN = docbook2man
-DOC2PDF = docbook2pdf
-
-TXT = fontconfig-user.txt fontconfig-devel.txt
-PDF = fontconfig-user.pdf fontconfig-devel.pdf
-HTML_FILES = fontconfig-user.html
+DOC2TXT = docbook2txt
+DOC2MAN = docbook2man
+DOC2PDF = docbook2pdf
+
+DOC_FUNCS_FNCS = \
+ fcatomic.fncs \
+ fcblanks.fncs \
+ fccache.fncs \
+ fccharset.fncs \
+ fcconfig.fncs \
+ fcconstant.fncs \
+ fcdircache.fncs \
+ fcfile.fncs \
+ fcfontset.fncs \
+ fcformat.fncs \
+ fcfreetype.fncs \
+ fcinit.fncs \
+ fclangset.fncs \
+ fcmatrix.fncs \
+ fcobjectset.fncs \
+ fcobjecttype.fncs \
+ fcpattern.fncs \
+ fcstring.fncs \
+ fcstrset.fncs \
+ fcvalue.fncs \
+ $(NULL)
+SGML_FILES = \
+ $(srcdir)/fontconfig-user.sgml \
+ $(srcdir)/fontconfig-devel.sgml \
+ $(NULL)
+LOCAL_SGML_FILES = \
+ local-fontconfig-user.sgml \
+ local-fontconfig-devel.sgml \
+ $(NULL)
+
+DOC_FUNCS_SGML = $(DOC_FUNCS_FNCS:.fncs=.sgml)
+BUILT_DOCS = \
+ $(HTML_FILES) \
+ $(PDF_FILES) \
+ $(TXT_FILES) \
+ $(man3_MANS) \
+ $(man5_MANS) \
+ $(NULL)
+DOCS_DEPS = \
+ $(DOC_FUNCS_SGML) \
+ confdir.sgml \
+ version.sgml \
+ $(NULL)
+
+TXT_FILES = $(SGML_FILES:.sgml=.txt)
+PDF_FILES = $(SGML_FILES:.sgml=.pdf)
+HTML_FILES = \
+ fontconfig-user.html \
+ $(NULL)
HTML_DIR = fontconfig-devel
-SGML = fontconfig-user.sgml fontconfig-devel.sgml
-FNCS_TMPL = ${DOC_SRC}/func.sgml
-
-DOC_FUNCS_FNCS=\
- fcatomic.fncs \
- fcblanks.fncs \
- fccache.fncs \
- fccharset.fncs \
- fcconfig.fncs \
- fcconstant.fncs \
- fcdircache.fncs \
- fcfile.fncs \
- fcfontset.fncs \
- fcformat.fncs \
- fcfreetype.fncs \
- fcinit.fncs \
- fclangset.fncs \
- fcmatrix.fncs \
- fcobjectset.fncs \
- fcobjecttype.fncs \
- fcpattern.fncs \
- fcstring.fncs \
- fcstrset.fncs \
- fcvalue.fncs
-
-DOC_FUNCS_SGML=\
- fcatomic.sgml \
- fcblanks.sgml \
- fccache.sgml \
- fccharset.sgml \
- fcconfig.sgml \
- fcconstant.sgml \
- fcdircache.sgml \
- fcfile.sgml \
- fcfontset.sgml \
- fcformat.sgml \
- fcfreetype.sgml \
- fcinit.sgml \
- fclangset.sgml \
- fcmatrix.sgml \
- fcobjectset.sgml \
- fcobjecttype.sgml \
- fcpattern.sgml \
- fcstring.sgml \
- fcstrset.sgml \
- fcvalue.sgml
-
-man5_MANS=fonts-conf.5
-man3_MANS=$(DOCMAN3)
-
-noinst_PROGRAMS=edit-sgml
-edit_sgml_SOURCES=edit-sgml.c
-
-DOC_FILES=$(TXT) $(PDF) $(HTML_FILES)
-LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/*
-
-check_SCRIPTS=check-missing-doc
-TESTS_ENVIRONMENT=top_srcdir=${top_srcdir} sh
-TESTS=check-missing-doc
-
-EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(DOC_FUNCS_SGML) $(check_SCRIPTS) func.sgml confdir.sgml.in
-
-SUFFIXES=.fncs .sgml .txt .html
+#
+noinst_PROGRAMS = \
+ $(NULL)
+##
+edit_sgml_SOURCES = \
+ edit-sgml.c \
+ $(NULL)
+#
+check_SCRIPTS = \
+ check-missing-doc \
+ $(NULL)
+#
+man3_MANS = \
+ $(DOCMAN3) \
+ $(NULL)
+man5_MANS = \
+ fonts-conf.5 \
+ $(NULL)
+#
+doc_DATA = \
+ $(TXT_FILES) \
+ $(PDF_FILES) \
+ $(HTML_FILES) \
+ $(NULL)
+#
+htmldocdir = $(docdir)/$(HTML_DIR)
+htmldoc_DATA = \
+ $(NULL)
if USEDOCBOOK
-
+BUILT_SOURCES += \
+ $(LOCAL_SGML_FILES) \
+ func.refs \
+ $(NULL)
+noinst_PROGRAMS += \
+ edit-sgml \
+ $(NULL)
+htmldoc_DATA += $(HTML_DIR)/*
+
+##
if CROSS_COMPILING
.fncs.sgml:
@echo Warning: cannot rebuild $@ when cross-compiling
else
-.fncs.sgml: ./edit-sgml$(EXEEXT)
- $(RM) $@
- ./edit-sgml$(EXEEXT) $(FNCS_TMPL) < '$<' > $*.sgml
+.fncs.sgml: edit-sgml$(EXEEXT) $(srcdir)/func.sgml
+ -rm $@
+ $(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$<' > $*.sgml
endif
-
-.sgml.txt:
- $(RM) $@
- $(DOC2TXT) $<
-
-.sgml.pdf:
- $(RM) $@
- $(DOC2PDF) $<
-
-$(man3_MANS): func.refs
-
-func.refs: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
- $(RM) func.refs
- $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \
- mv devel-man/manpage.refs func.refs && \
- mv devel-man/*.3 . && \
- $(RM) devel-man/manpage.* && \
- rmdir devel-man
-
-local-fontconfig-devel.sgml: fontconfig-devel.sgml
- $(LN_S) $< $@
-
-$(DOC_FUNCS_SGML): edit-sgml.c $(FNCS_TMPL)
-
+.sgml.txt: $(DOCS_DEPS)
+ -rm $@
+ $(AM_V_GEN) $(DOC2TXT) $<
+.sgml.pdf: $(DOCS_DEPS)
+ -rm $@
+ $(AM_V_GEN) $(DOC2PDF) $<
+.sgml.html: $(DOCS_DEPS)
+ -rm $@
+ $(AM_V_GEN) $(DOC2HTML) -u $< > $@
+##
fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
- $(RM) $@
- $(DOC2MAN) local-fontconfig-user.sgml && \
+ -rm $@
+ $(AM_V_GEN) $(DOC2MAN) $< && \
$(RM) manpage.*
-
-local-fontconfig-user.sgml: fontconfig-user.sgml
- $(LN_S) $< $@
-
-all-local: $(LOCAL_DOCS)
-
-clean-local:
- $(RM) $(man3_MANS) $(man5_MANS) $(DOC_FILES) func.refs
- $(RM) -r $(HTML_DIR)
-
-MAINTAINERCLEANFILES = $(DOC_FUNCS_SGML)
-
-$(HTML_DIR): local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
- $(RM) -r $(HTML_DIR)
- $(DOC2HTML) -V '%use-id-as-filename%' -o $(HTML_DIR) local-fontconfig-devel.sgml
-
-fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
- $(RM) $@
- $(DOC2TXT) local-fontconfig-devel.sgml
- mv local-fontconfig-devel.txt $@
-
-fontconfig-devel.pdf: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
- $(RM) $@
- $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
- || echo Failed to generate $@ >&2; \
- (test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
-
-fontconfig-user.html: local-fontconfig-user.sgml version.sgml confdir.sgml
- $(RM) $@ local-$@ $@.tmp
- $(DOC2HTML) -u local-fontconfig-user.sgml > $@.tmp
- -test -f local-$@ && mv local-$@ $@
- -test -f $@ || mv $@.tmp $@
- -test -f $@.tmp && $(RM) $@.tmp
-
-fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml
- $(RM) $@
- $(DOC2TXT) local-fontconfig-user.sgml
- mv local-fontconfig-user.txt $@
-
-fontconfig-user.pdf: local-fontconfig-user.sgml version.sgml confdir.sgml
- $(RM) $@
- $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \
- || echo Failed to generate $@ >&2; \
- (test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
-
-STRIPNL=awk '{ if (NR > 1) printf ("\n"); printf ("%s", $$0); }'
-confdir.sgml: ${DOC_SRC}/confdir.sgml.in
- sed "s,@CONFDIR\@,${CONFDIR}," < ${DOC_SRC}/confdir.sgml.in | $(STRIPNL) > confdir.sgml
-
-CLEANFILES=confdir.sgml local-fontconfig-user.sgml local-fontconfig-devel.sgml
-
-htmldoc_DATA = $(HTML_DIR)/*
-
+##
+$(man3_MANS): func.refs
+func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS)
+ -rm $@
+ [ "x$(builddir)" != "x$(srcdir)" ] && \
+ for f in $(DOC_FUNCS_SGML); do \
+ $(RM) $(builddir)/$$f || :; \
+ $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \
+ done || :
+ $(AM_V_GEN) $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \
+ mv devel-man/manpage.refs func.refs && \
+ mv devel-man/*.3 . && \
+ $(RM) devel-man/manpage.* && \
+ rmdir devel-man
+confdir.sgml: $(srcdir)/confdir.sgml.in
+ $(AM_V_GEN) sed -e 's,@CONFDIR\@,${CONFDIR},' $< | awk '{if (NR > 1) printf("\n"); printf("%s", $$0);}' > $@
+##
$(HTML_DIR)/*: $(HTML_DIR)
-
+$(HTML_DIR): local-fontconfig-devel.sgml $(DOCS_DEPS)
+ -rm -r $@
+ $(AM_V_GEN) $(DOC2HTML) -V '%use-id-as-filename%' -o $@ local-fontconfig-devel.sgml
+local-fontconfig-user.sgml: $(srcdir)/fontconfig-user.sgml
+ $(AM_V_GEN) $(LN_S) $< $@
+local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml
+ $(AM_V_GEN) $(LN_S) $< $@
+#
+all-local: $(BUILT_DOCS) $(HTML_DIR)/*
+clean-local:
+ -rm -r $(HTML_DIR) devel-man
else
-
-htmldoc_DATA = $(srcdir)/$(HTML_DIR)/*
-
+htmldoc_DATA += $(srcdir)/$(HTML_DIR)/*
all-local:
clean-local:
endif
-
-htmldocdir=$(docdir)/$(HTML_DIR)
-
-doc_DATA = $(DOC_FILES)
-
diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am
index 4f255fc..de657af 100644
--- a/fc-case/Makefile.am
+++ b/fc-case/Makefile.am
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
#
# $Id $
#
@@ -61,4 +62,6 @@ $(ALIAS_FILES):
CLEANFILES = $(ALIAS_FILES)
+DISTCLEANFILES = $(TARG)
+
MAINTAINERCLEANFILES = $(TARG)
diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am
index 3799880..697b5c3 100644
--- a/fc-glyphname/Makefile.am
+++ b/fc-glyphname/Makefile.am
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
#
# $Id $
#
@@ -54,4 +55,6 @@ $(ALIAS_FILES):
CLEANFILES = $(ALIAS_FILES)
+DISTCLEANFILES = $(TARG)
+
MAINTAINERCLEANFILES = $(TARG)
diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index 1f662c1..d2eca5b 100644
--- a/fc-lang/Makefile.am
+++ b/fc-lang/Makefile.am
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
#
# $Id $
#
@@ -53,6 +54,8 @@ $(ALIAS_FILES):
CLEANFILES = $(ALIAS_FILES)
+DISTCLEANFILES = $(TARG)
+
MAINTAINERCLEANFILES = $(TARG)
# NOTE:
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
