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)
References? "$(RM)" is standard autotools way of invoking rm -f. behdad On 03/10/2012 09:30 AM, Akira TAGOH wrote:> 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) > _______________________________________________ > Fontconfig mailing list > Fontconfig at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/fontconfig >
All of the fixes for Makefile.am is to be able to build with BSD make. I should draw the details in the log more. On Sun, Mar 11, 2012 at 4:29 AM, Behdad Esfahbod <behdad at behdad.org> wrote:> References? ?"$(RM)" is standard autotools way of invoking rm -f. > > behdad > > On 03/10/2012 09:30 AM, Akira TAGOH wrote: >> ?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) >> _______________________________________________ >> Fontconfig mailing list >> Fontconfig at lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/fontconfig >>-- Akira TAGOH
On 03/10/2012 06:39 PM, Akira TAGOH wrote:> All of the fixes for Makefile.am is to be able to build with BSD make. > I should draw the details in the log more.Did you investigate why $(RM) wasn''t working? Being portable is exactly why autotools defines $(RM). Not using it is asking for trouble. More comments below:> On Sun, Mar 11, 2012 at 4:29 AM, Behdad Esfahbod <behdad at behdad.org> wrote: >>> && mv -f $@.tmp $@ \ >>> - || ($(RM) $@.tmp; \ >>> + || (rm -f $@.tmp; \So what was $(RM) defined to on the failing platform?>>> ${man_MANS}: ${SGML} >>> - $(RM) $@ >>> - $(DOC2MAN) ${SGML} >>> - $(RM) manpage.* >>> + - at rm $@ >>> + $(AM_V_GEN) $(DOC2MAN) ${SGML} >>> + @rm -f manpage.*Any place like this, if you use "rm" and not "rm -f", that''s a bug, because if the target file doesn''t exist, rm will fail. There''s a few of those in this change. behdad
On Thursday 15 March 2012 18:03:47 Behdad Esfahbod wrote:> On 03/10/2012 06:39 PM, Akira TAGOH wrote: > > All of the fixes for Makefile.am is to be able to build with BSD make. > > I should draw the details in the log more. > > Did you investigate why $(RM) wasn''t working? Being portable is exactly > why autotools defines $(RM). Not using it is asking for trouble. More > commentsi forgot to ask this ... thanks for bringing this up :). i don''t really understand this move to executing `rm` directly either. -mike -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: <http://lists.freedesktop.org/archives/fontconfig/attachments/20120315/4e526acd/attachment-0001.pgp>
On Fri, Mar 16, 2012 at 7:03 AM, Behdad Esfahbod <behdad at behdad.org> wrote:> Did you investigate why $(RM) wasn''t working? ?Being portable is exactly why > autotools defines $(RM). ?Not using it is asking for trouble. ?More commentsNot really. $(RM) is pre-defined value by GNU make. see: $ make --version GNU Make 3.82 Built for x86_64-redhat-linux-gnu Copyright (C) 2010 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. $ make -p | grep "^RM =" RM = rm -f $ and On FreeBSD say: $ make -p | grep "^RM =" $> Any place like this, if you use "rm" and not "rm -f", that''s a bug, because if > the target file doesn''t exist, rm will fail. ?There''s a few of those in this > change.That''s why adding a ''-'' to ignore an error. This is ugly fix right. probably that would be better checking if make has the pre-defined RM and set RM if not available. let me revert the changes and commit better thing. -- Akira TAGOH