diff options
author | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
commit | 0f834b91a4768673833ab4917e87d86c237bb1a6 (patch) | |
tree | 363489504ed4b2d360259b8de4c9e392918e5d02 /fontconfig/doc | |
parent | fc72edebf875378459368c5383d9023730cbca54 (diff) | |
download | vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.gz vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.bz2 vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.zip |
libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update
23 Mar 2012
Diffstat (limited to 'fontconfig/doc')
-rw-r--r-- | fontconfig/doc/Makefile.am | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/fontconfig/doc/Makefile.am b/fontconfig/doc/Makefile.am index f483bc757..e86abe9e3 100644 --- a/fontconfig/doc/Makefile.am +++ b/fontconfig/doc/Makefile.am @@ -154,45 +154,49 @@ if CROSS_COMPILING .fncs.sgml: @echo Warning: cannot rebuild $@ when cross-compiling else -.fncs.sgml: edit-sgml$(EXEEXT) $(srcdir)/func.sgml - -@rm $@ - $(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$*.fncs' > $*.sgml +.fncs.sgml: + $(AM_V_GEN) $(RM) $@; \ + $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$*.fncs' > $*.sgml endif -.sgml.txt: $(DOCS_DEPS) - -@rm $@ - $(AM_V_GEN) $(DOC2TXT) $*.sgml -.sgml.pdf: $(DOCS_DEPS) - -@rm $@ - $(AM_V_GEN) $(DOC2PDF) $*.sgml -.sgml.html: $(DOCS_DEPS) - -@rm $@ - $(AM_V_GEN) $(DOC2HTML) -u $*.sgml > $@ +.sgml.txt: + $(AM_V_GEN) $(RM) $@; \ + $(DOC2TXT) $*.sgml +.sgml.pdf: + $(AM_V_GEN) $(RM) $@; \ + $(DOC2PDF) $*.sgml +.sgml.html: + $(AM_V_GEN) $(RM) $@; \ + $(DOC2HTML) -u $*.sgml > $@ ## fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml - -@rm $@ - $(AM_V_GEN) $(DOC2MAN) local-fontconfig-user.sgml && \ - rm manpage.* + $(AM_V_GEN) $(RM) $@; \ + $(DOC2MAN) local-fontconfig-user.sgml && \ + $(RM) manpage.* ## $(man3_MANS): func.refs func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS) - -@rm $@ + $(AM_V_GEN) $(RM) $@; \ [ "x$(builddir)" != "x$(srcdir)" ] && \ for f in $(DOC_FUNCS_SGML); do \ - rm -f $(builddir)/$$f || :; \ + $(RM) $(builddir)/$$f || :; \ $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ - done || : - $(AM_V_GEN) $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \ + done || :; \ + $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \ mv devel-man/manpage.refs func.refs && \ mv devel-man/*.3 . && \ - rm devel-man/manpage.* && \ + $(RM) devel-man/manpage.* && \ rmdir devel-man 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);}' > $@ ## +$(DOC_FUNCS_SGML): $(DOC_FUNCS_FNCS) edit-sgml$(EXEEXT) $(srcdir)/func.sgml +$(TXT_FILES): $(DOCS_DEPS) +$(PDF_FILES): $(DOCS_DEPS) +$(HTML_FILES): $(DOCS_DEPS) $(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 + $(AM_V_GEN) $(RM) -r $@; \ + $(DOC2HTML) -V '%use-id-as-filename%' -o $@ local-fontconfig-devel.sgml local-fontconfig-user.sgml: $(srcdir)/fontconfig-user.sgml $(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@ local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml @@ -200,7 +204,7 @@ local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml # all-local: $(BUILT_DOCS) $(HTML_DIR)/* clean-local: - -rm -r $(HTML_DIR) devel-man + $(RM) -r $(HTML_DIR) devel-man else htmldoc_DATA += $(srcdir)/$(HTML_DIR)/* all-local: |