[Fontconfig] fontconfig: Branch 'master'
Akira TAGOH
tagoh at kemper.freedesktop.org
Sat Mar 10 06:30:45 PST 2012
Makefile.am | 2 +-
doc/Makefile.am | 20 ++++++++++----------
fc-cache/Makefile.am | 10 +++++-----
fc-case/Makefile.am | 2 +-
fc-cat/Makefile.am | 6 +++---
fc-glyphname/Makefile.am | 2 +-
fc-lang/Makefile.am | 2 +-
fc-list/Makefile.am | 8 ++++----
fc-match/Makefile.am | 8 ++++----
fc-pattern/Makefile.am | 6 +++---
fc-query/Makefile.am | 8 ++++----
fc-scan/Makefile.am | 8 ++++----
src/Makefile.am | 2 +-
13 files changed, 42 insertions(+), 42 deletions(-)
New commits:
commit 0fdfddf2ac93c1c0238b70a265998fd6b5ffe7af
Author: Akira TAGOH <akira at tagoh.org>
Date: Sat Mar 10 23:30:30 2012 +0900
Fix a build fail on some environment.
diff --git a/Makefile.am b/Makefile.am
index 7931717..3074001 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,7 @@ $(srcdir)/ChangeLog:
if test -d "$(srcdir)/.git"; then \
(GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp $@ \
- || ($(RM) $@.tmp; \
+ || (rm -f $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
(test -f $@ || echo git-log is required to generate this file >> $@)); \
else \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6c75c6c..a29b0cd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -155,43 +155,43 @@ if CROSS_COMPILING
@echo Warning: cannot rebuild $@ when cross-compiling
else
.fncs.sgml: edit-sgml$(EXEEXT) $(srcdir)/func.sgml
- -rm $@
+ - at rm $@
$(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$<' > $*.sgml
endif
.sgml.txt: $(DOCS_DEPS)
- -rm $@
+ - at rm $@
$(AM_V_GEN) $(DOC2TXT) $<
.sgml.pdf: $(DOCS_DEPS)
- -rm $@
+ - at rm $@
$(AM_V_GEN) $(DOC2PDF) $<
.sgml.html: $(DOCS_DEPS)
- -rm $@
+ - at rm $@
$(AM_V_GEN) $(DOC2HTML) -u $< > $@
##
fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
- -rm $@
+ - at rm $@
$(AM_V_GEN) $(DOC2MAN) $< && \
- $(RM) manpage.*
+ rm manpage.*
##
$(man3_MANS): func.refs
func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS)
- -rm $@
+ - at rm $@
[ "x$(builddir)" != "x$(srcdir)" ] && \
for f in $(DOC_FUNCS_SGML); do \
- $(RM) $(builddir)/$$f || :; \
+ rm -f $(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.* && \
+ rm devel-man/manpage.* && \
rmdir devel-man
confdir.sgml: $(srcdir)/confdir.sgml.in
$(AM_V_GEN) sed -e 's, at 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 $@
+ - at 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) $< $@
diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 300c966..b647c3f 100644
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -33,7 +33,7 @@ install-data-local:
-$(mkinstalldirs) "$(DESTDIR)$(fc_cachedir)"
uninstall-local:
- -$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
+ -rm -rf "$(DESTDIR)$(fc_cachedir)"
endif
INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
@@ -53,14 +53,14 @@ fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK
${man_MANS}: ${SGML}
- $(RM) $@
- $(DOC2MAN) ${SGML}
- $(RM) manpage.*
+ - at rm $@
+ $(AM_V_GEN) $(DOC2MAN) ${SGML}
+ @rm -f manpage.*
all-local: $(man_MANS)
clean-local:
- $(RM) $(man_MANS)
+ -rm $(man_MANS)
else
all-local:
diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am
index 9138c19..1855d47 100644
--- a/fc-case/Makefile.am
+++ b/fc-case/Makefile.am
@@ -46,7 +46,7 @@ $(TARG): $(STMPL) fc-case.c $(SCASEFOLDING)
@echo Warning: cannot rebuild $(TARG) when cross-compiling
else
$(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING)
- -rm $(TARG)
+ - at rm $(TARG)
$(AM_V_GEN) $(builddir)/fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG)
endif
diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 5874595..6bc6168 100644
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -44,14 +44,14 @@ fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK
${man_MANS}: ${SGML}
- $(RM) $@
+ - at rm $@
$(DOC2MAN) ${SGML}
- $(RM) manpage.*
+ @rm -f manpage.*
all-local: $(man_MANS)
clean-local:
- $(RM) $(man_MANS)
+ -rm $(man_MANS)
else
all-local:
diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am
index 13b3d7b..8378707 100644
--- a/fc-glyphname/Makefile.am
+++ b/fc-glyphname/Makefile.am
@@ -41,7 +41,7 @@ $(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME)
@echo Warning: cannot rebuild $(TARG) when cross-compiling
else
$(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME)
- -rm $(TARG)
+ - at rm $(TARG)
$(AM_V_GEN) $(builddir)/fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG)
endif
diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index 09292bb..54fde38 100644
--- a/fc-lang/Makefile.am
+++ b/fc-lang/Makefile.am
@@ -40,7 +40,7 @@ $(TARG):$(ORTH) fc-lang.c $(STMPL)
@echo Warning: cannot rebuild $(TARG) when cross-compiling
else
$(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL)
- -rm $(TARG)
+ - at rm $(TARG)
$(AM_V_GEN) $(builddir)/fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG)
endif
diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
index d40700a..fb87b50 100644
--- a/fc-list/Makefile.am
+++ b/fc-list/Makefile.am
@@ -44,14 +44,14 @@ fc_list_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK
${man_MANS}: ${SGML}
- $(RM) $@
- $(DOC2MAN) ${SGML}
- $(RM) manpage.*
+ - at rm $@
+ $(AM_V_GEN) $(DOC2MAN) ${SGML}
+ @rm manpage.*
all-local: $(man_MANS)
clean-local:
- $(RM) $(man_MANS)
+ -rm $(man_MANS)
else
all-local:
diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am
index 94fc7d9..3bdff6d 100644
--- a/fc-match/Makefile.am
+++ b/fc-match/Makefile.am
@@ -44,14 +44,14 @@ fc_match_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK
${man_MANS}: ${SGML}
- $(RM) $@
- $(DOC2MAN) ${SGML}
- $(RM) manpage.*
+ - at rm $@
+ $(AM_V_GEN) $(DOC2MAN) ${SGML}
+ @rm manpage.*
all-local: $(man_MANS)
clean-local:
- $(RM) $(man_MANS)
+ -rm $(man_MANS)
else
all-local:
diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am
index a7db210..085c1da 100644
--- a/fc-pattern/Makefile.am
+++ b/fc-pattern/Makefile.am
@@ -44,14 +44,14 @@ fc_pattern_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK
${man_MANS}: ${SGML}
- $(RM) $@
+ - at rm $@
$(DOC2MAN) ${SGML}
- $(RM) manpage.*
+ @rm manpage.*
all-local: $(man_MANS)
clean-local:
- $(RM) $(man_MANS)
+ -rm $(man_MANS)
else
all-local:
diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am
index 132dd40..31fced9 100644
--- a/fc-query/Makefile.am
+++ b/fc-query/Makefile.am
@@ -44,14 +44,14 @@ fc_query_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK
${man_MANS}: ${SGML}
- $(RM) $@
- $(DOC2MAN) ${SGML}
- $(RM) manpage.*
+ - at rm $@
+ $(AM_V_GEN) $(DOC2MAN) ${SGML}
+ @rm manpage.*
all-local: $(man_MANS)
clean-local:
- $(RM) $(man_MANS)
+ -rm $(man_MANS)
else
all-local:
diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am
index c9d8904..f36e8f4 100644
--- a/fc-scan/Makefile.am
+++ b/fc-scan/Makefile.am
@@ -44,14 +44,14 @@ fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK
${man_MANS}: ${SGML}
- $(RM) $@
- $(DOC2MAN) ${SGML}
- $(RM) manpage.*
+ - at rm $@
+ $(AM_V_GEN) $(DOC2MAN) ${SGML}
+ @rm manpage.*
all-local: $(man_MANS)
clean-local:
- $(RM) $(man_MANS)
+ -rm $(man_MANS)
else
all-local:
diff --git a/src/Makefile.am b/src/Makefile.am
index 090f9b1..a7bb73c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -164,4 +164,4 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
sort; \
echo LIBRARY libfontconfig- at LIBT_CURRENT_MINUS_AGE@.dll; \
echo VERSION @LIBT_CURRENT at .@LIBT_REVISION@) >$@
- @ ! grep -q FcERROR $@ || ($(RM) $@; false)
+ @ ! grep -q FcERROR $@ || (rm $@; false)
More information about the Fontconfig
mailing list