diff --git a/doc/Makefile.am b/doc/Makefile.am index 2e7363c..80674df 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -176,16 +176,11 @@ fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml $(man3_MANS): func.refs func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS) $(AM_V_GEN) $(RM) $@; \ - [ "x$(builddir)" != "x$(srcdir)" ] && \ - for f in $(DOC_FUNCS_SGML); do \ - $(RM) $(builddir)/$$f || :; \ - $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ - done || :; \ $(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 + rmdir devel-man || rm $@ || : confdir.sgml: $(srcdir)/confdir.sgml.in $(AM_V_GEN) sed -e 's,@CONFDIR\@,${CONFDIR},' $(srcdir)/$@.in | awk '{if (NR > 1) printf("\n"); printf("%s", $$0);}' > $@ ## @@ -207,7 +202,7 @@ local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml all-local: $(BUILT_DOCS) $(HTML_DIR)/* clean-local: $(RM) -r $(HTML_DIR) devel-man - [ "x$(builddir)" != "x$(srcdir)" ] && $(RM) $(builddir)/fontconfig-user.sgml $(builddir)/fontconfig-devel.sgml || : + [ "x$(builddir)" != "x$(srcdir)" ] && $(RM) $(builddir)/*.sgml || : else htmldoc_DATA += $(srcdir)/$(HTML_DIR)/* all-local: diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am index 6914824..6fe3a44 100644 --- a/fc-case/Makefile.am +++ b/fc-case/Makefile.am @@ -45,7 +45,10 @@ if CROSS_COMPILING $(TARG): $(STMPL) fc-case.c $(SCASEFOLDING) @echo Warning: cannot rebuild $(TARG) when cross-compiling else -$(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING) +## BUILT_SOURCES doesn't effect to 'distcheck' +## so $(ALIAS_FILES) has to be appeared prior to fc-case$(EXEEXT) +## to make sure availability. +$(TARG): $(STMPL) $(ALIAS_FILES) fc-case$(EXEEXT) $(SCASEFOLDING) $(AM_V_GEN) $(RM) $(TARG); \ ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) @@ -56,7 +59,7 @@ ALIAS_FILES = fcalias.h fcaliastail.h BUILT_SOURCES = $(ALIAS_FILES) $(ALIAS_FILES): - touch $(ALIAS_FILES) + $(AM_V_GEN) touch $@ CLEANFILES = $(ALIAS_FILES) diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am index fdba146..e33b3ba 100644 --- a/fc-glyphname/Makefile.am +++ b/fc-glyphname/Makefile.am @@ -40,7 +40,10 @@ if CROSS_COMPILING $(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME) @echo Warning: cannot rebuild $(TARG) when cross-compiling else -$(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME) +## BUILT_SOURCES doesn't effect to 'distcheck' +## so $(ALIAS_FILES) has to be appeared prior to fc-glyphname$(EXEEXT) +## to make sure availability. +$(TARG): $(STMPL) $(ALIAS_FILES) fc-glyphname$(EXEEXT) $(SGLYPHNAME) $(AM_V_GEN) $(RM) $(TARG); \ ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) @@ -48,10 +51,10 @@ endif ALIAS_FILES = fcalias.h fcaliastail.h -BUILT_SOURCES = $(ALIAS_FILES) $(TARG) +BUILT_SOURCES = $(ALIAS_FILES) $(ALIAS_FILES): - touch $(ALIAS_FILES) + $(AM_V_GEN) touch $@ CLEANFILES = $(ALIAS_FILES) diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am index 5c2d1bf..3336511 100644 --- a/fc-lang/Makefile.am +++ b/fc-lang/Makefile.am @@ -39,7 +39,10 @@ if CROSS_COMPILING $(TARG):$(ORTH) fc-lang.c $(STMPL) @echo Warning: cannot rebuild $(TARG) when cross-compiling else -$(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL) +## BUILT_SOURCES doesn't effect to 'distcheck' +## so $(ALIAS_FILES) has to be appeared prior to fc-lang$(EXEEXT) +## to make sure availability. +$(TARG):$(ORTH) $(ALIAS_FILES) fc-lang${EXEEXT} $(STMPL) $(AM_V_GEN) $(RM) $(TARG); \ ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) @@ -47,10 +50,10 @@ endif ALIAS_FILES = fcalias.h fcaliastail.h -BUILT_SOURCES = $(ALIAS_FILES) $(TARG) +BUILT_SOURCES = $(ALIAS_FILES) $(ALIAS_FILES): - touch $(ALIAS_FILES) + $(AM_V_GEN) touch $@ CLEANFILES = $(ALIAS_FILES)