Makefile.am | 12 ++++++------ conf.d/Makefile.am | 8 ++++---- configure.in | 9 +++++++++ doc/Makefile.am | 38 +++++++++++++++++++------------------- fc-cache/Makefile.am | 10 +++++----- fc-case/Makefile.am | 4 ++-- fc-cat/Makefile.am | 8 ++++---- fc-glyphname/Makefile.am | 4 ++-- fc-lang/Makefile.am | 4 ++-- fc-list/Makefile.am | 8 ++++---- fc-match/Makefile.am | 8 ++++---- fc-pattern/Makefile.am | 8 ++++---- fc-query/Makefile.am | 8 ++++---- fc-scan/Makefile.am | 8 ++++---- src/Makefile.am | 10 +++++----- 15 files changed, 78 insertions(+), 69 deletions(-) New commits: commit 93460f93e9e55e39a42fb6474918f31539436d9c Author: Akira TAGOH <akira at tagoh.org> Date: Fri Mar 16 16:29:53 2012 +0900 Fix a build issue due to the use of non-portable variables $< isn''t supported in BSD make say. $(RM) is pre-defined in GNU make though, not in BSD make say. so changed to check on configure if it''s pre-defined by make, otherwise set the appropriate command to $(RM). This would be a workaround until it has the certain pre-defined value. diff --git a/Makefile.am b/Makefile.am index 7fa1b76..9342f8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,12 +120,12 @@ uninstall-local: if [ -f $(srcdir)/fonts.conf ]; then \ if cmp -s $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \ echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \ - rm -f $(DESTDIR)$(configdir)/fonts.conf; \ + $(RM) $(DESTDIR)$(configdir)/fonts.conf; \ fi; \ else if [ -f fonts.conf ]; then \ if cmp -s fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \ echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \ - rm -f $(DESTDIR)$(configdir)/fonts.conf; \ + $(RM) $(DESTDIR)$(configdir)/fonts.conf; \ fi; \ fi; fi @@ -136,7 +136,7 @@ debuild-unsigned: debuild-dirs (cd $(distdir)/debian && debuild -us -uc) debuild-dirs: distdir - rm -f $(PACKAGE)_$(VERSION).orig.tar.gz - rm -rf $(distdir).orig + $(RM) $(PACKAGE)_$(VERSION).orig.tar.gz + $(RM) -r $(distdir).orig cp -a $(distdir) $(distdir).orig - rm -rf $(distdir).orig/debian + $(RM) -r $(distdir).orig/debian diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am index d122a8f..13f243b 100644 --- a/conf.d/Makefile.am +++ b/conf.d/Makefile.am @@ -86,14 +86,14 @@ install-data-local: @(echo cd ${DESTDIR}${confddir}; \ cd ${DESTDIR}${confddir}; \ for i in ${CONF_LINKS}; do \ - rm -f $$i; \ - echo rm -f $$i";" ln -s ../conf.avail/$$i .; \ + $(RM) $$i; \ + echo $(RM) $$i";" ln -s ../conf.avail/$$i .; \ ln -s ../conf.avail/$$i .; \ done) uninstall-local: @(echo cd ${DESTDIR}${confddir}; \ cd ${DESTDIR}${confddir}; \ for i in ${CONF_LINKS}; do \ - echo rm -f $$i; \ - rm -f $$i; \ + echo $(RM) $$i; \ + $(RM) $$i; \ done) diff --git a/configure.in b/configure.in index da6ef95..3204f2e 100644 --- a/configure.in +++ b/configure.in @@ -64,6 +64,15 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL AC_PROG_MAKE_SET +AC_MSG_CHECKING([for RM macro]) +_predefined_rm=`make -p -f /dev/null 2>/dev/null|grep ''^RM =''|sed -e ''s/^RM = //''` +if test "x$_predefined_rm" = "x"; then + AC_MSG_RESULT([no predefined RM]) + AC_CHECK_PROG(RM, rm, [rm -f]) +else + AC_MSG_RESULT($_predefined_rm) +fi + dnl ========================================================================= case "$host" in diff --git a/doc/Makefile.am b/doc/Makefile.am index b9c0e31..02ff25c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -155,33 +155,33 @@ if CROSS_COMPILING @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 < ''$<'' > $*.sgml + $(AM_V_GEN) $(RM) $@; \ + $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < ''$*.fncs'' > $*.sgml endif .sgml.txt: $(DOCS_DEPS) - -rm $@ - $(AM_V_GEN) $(DOC2TXT) $< + $(AM_V_GEN) $(RM) $@; \ + $(DOC2TXT) $*.sgml .sgml.pdf: $(DOCS_DEPS) - -rm $@ - $(AM_V_GEN) $(DOC2PDF) $< + $(AM_V_GEN) $(RM) $@; \ + $(DOC2PDF) $*.sgml .sgml.html: $(DOCS_DEPS) - -rm $@ - $(AM_V_GEN) $(DOC2HTML) -u $< > $@ + $(AM_V_GEN) $(RM) $@; \ + $(DOC2HTML) -u $*.sgml > $@ ## fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml - -rm $@ - $(AM_V_GEN) $(DOC2MAN) $< && \ + $(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) $(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.* && \ @@ -191,8 +191,8 @@ confdir.sgml: $(srcdir)/confdir.sgml.in ## $(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 +200,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: diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am index 300c966..8f455c8 100644 --- a/fc-cache/Makefile.am +++ b/fc-cache/Makefile.am @@ -53,8 +53,8 @@ fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK ${man_MANS}: ${SGML} - $(RM) $@ - $(DOC2MAN) ${SGML} + $(AM_V_GEN) $(RM) $@; \ + $(DOC2MAN) ${SGML}; \ $(RM) manpage.* all-local: $(man_MANS) diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am index de657af..ad5dc74 100644 --- a/fc-case/Makefile.am +++ b/fc-case/Makefile.am @@ -33,10 +33,8 @@ noinst_PROGRAMS=fc-case noinst_HEADERS=$(TARG) -fc_case_SRCS= \ - fc-case.c \ - fccaseint.h \ - fccaseread.c +fc_case_SOURCES= \ + fc-case.c CASEFOLDING=CaseFolding.txt SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am index 5874595..8a2939a 100644 --- a/fc-cat/Makefile.am +++ b/fc-cat/Makefile.am @@ -44,8 +44,8 @@ fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK ${man_MANS}: ${SGML} - $(RM) $@ - $(DOC2MAN) ${SGML} + $(AM_V_GEN) $(RM) $@; \ + $(DOC2MAN) ${SGML}; \ $(RM) manpage.* all-local: $(man_MANS) diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am index d40700a..7822ad4 100644 --- a/fc-list/Makefile.am +++ b/fc-list/Makefile.am @@ -44,8 +44,8 @@ fc_list_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK ${man_MANS}: ${SGML} - $(RM) $@ - $(DOC2MAN) ${SGML} + $(AM_V_GEN) $(RM) $@; \ + $(DOC2MAN) ${SGML}; \ $(RM) manpage.* all-local: $(man_MANS) diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am index 94fc7d9..d046b79 100644 --- a/fc-match/Makefile.am +++ b/fc-match/Makefile.am @@ -44,8 +44,8 @@ fc_match_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK ${man_MANS}: ${SGML} - $(RM) $@ - $(DOC2MAN) ${SGML} + $(AM_V_GEN) $(RM) $@; \ + $(DOC2MAN) ${SGML}; \ $(RM) manpage.* all-local: $(man_MANS) diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am index a7db210..fa66006 100644 --- a/fc-pattern/Makefile.am +++ b/fc-pattern/Makefile.am @@ -44,8 +44,8 @@ fc_pattern_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK ${man_MANS}: ${SGML} - $(RM) $@ - $(DOC2MAN) ${SGML} + $(AM_V_GEN) $(RM) $@; \ + $(DOC2MAN) ${SGML}; \ $(RM) manpage.* all-local: $(man_MANS) diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am index 132dd40..f60c363 100644 --- a/fc-query/Makefile.am +++ b/fc-query/Makefile.am @@ -44,8 +44,8 @@ fc_query_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK ${man_MANS}: ${SGML} - $(RM) $@ - $(DOC2MAN) ${SGML} + $(AM_V_GEN) $(RM) $@; \ + $(DOC2MAN) ${SGML}; \ $(RM) manpage.* all-local: $(man_MANS) diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am index c9d8904..8909691 100644 --- a/fc-scan/Makefile.am +++ b/fc-scan/Makefile.am @@ -44,8 +44,8 @@ fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK ${man_MANS}: ${SGML} - $(RM) $@ - $(DOC2MAN) ${SGML} + $(AM_V_GEN) $(RM) $@; \ + $(DOC2MAN) ${SGML}; \ $(RM) manpage.* all-local: $(man_MANS) diff --git a/src/Makefile.am b/src/Makefile.am index 090f9b1..fb30cd5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,7 +34,7 @@ install-libtool-import-lib: $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libfontconfig.dll.a $(DESTDIR)$(libdir)/fontconfig.def + $(RM) $(DESTDIR)$(libdir)/libfontconfig.dll.a $(DESTDIR)$(libdir)/fontconfig.def else @@ -58,7 +58,7 @@ install-ms-import-lib: $(INSTALL) fontconfig.lib $(DESTDIR)$(libdir) uninstall-ms-import-lib: - -rm $(DESTDIR)$(libdir)/fontconfig.lib + $(RM) $(DESTDIR)$(libdir)/fontconfig.lib else @@ -147,12 +147,12 @@ PUBLIC_FT_FILES = \ fcaliastail.h: fcalias.h fcalias.h: $(top_srcdir)/src/makealias $(PUBLIC_FILES) - sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" fcalias.h fcaliastail.h $(PUBLIC_FILES) + $(AM_V_GEN) sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" fcalias.h fcaliastail.h $(PUBLIC_FILES) fcftaliastail.h: fcftalias.h fcftalias.h: $(top_srcdir)/src/makealias $(PUBLIC_FT_FILES) - sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" fcftalias.h fcftaliastail.h $(PUBLIC_FT_FILES) + $(AM_V_GEN) sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" fcftalias.h fcftaliastail.h $(PUBLIC_FT_FILES) CLEANFILES = $(ALIAS_FILES) commit f2813ffc689fb6972ff4d5d414c3abfa3e0be26f Author: Akira TAGOH <akira at tagoh.org> Date: Fri Mar 16 11:55:47 2012 +0900 Revert "Fix a build fail on some environment" This reverts commit b75eb63982a54c0fb4576d8a655ef734908d3604. diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am index 9138c19..de657af 100644 --- a/fc-case/Makefile.am +++ b/fc-case/Makefile.am @@ -33,8 +33,10 @@ noinst_PROGRAMS=fc-case noinst_HEADERS=$(TARG) -fc_case_SOURCES= \ - fc-case.c +fc_case_SRCS= \ + fc-case.c \ + fccaseint.h \ + fccaseread.c CASEFOLDING=CaseFolding.txt SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt @@ -46,8 +48,8 @@ $(TARG): $(STMPL) fc-case.c $(SCASEFOLDING) @echo Warning: cannot rebuild $(TARG) when cross-compiling else $(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING) - -rm $(TARG) - $(AM_V_GEN) $(builddir)/fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \ + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) endif diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am index 13b3d7b..697b5c3 100644 --- a/fc-glyphname/Makefile.am +++ b/fc-glyphname/Makefile.am @@ -41,8 +41,8 @@ $(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME) @echo Warning: cannot rebuild $(TARG) when cross-compiling else $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME) - -rm $(TARG) - $(AM_V_GEN) $(builddir)/fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ + $(AM_V_GEN) $(RM) $(TARG); \ + ./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..d2eca5b 100644 --- a/fc-lang/Makefile.am +++ b/fc-lang/Makefile.am @@ -40,8 +40,8 @@ $(TARG):$(ORTH) fc-lang.c $(STMPL) @echo Warning: cannot rebuild $(TARG) when cross-compiling else $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL) - -rm $(TARG) - $(AM_V_GEN) $(builddir)/fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) endif commit a5b609196fe9cf688e5b4f7b7cd31fb2dc15b154 Author: Akira TAGOH <akira at tagoh.org> Date: Fri Mar 16 11:55:30 2012 +0900 Revert "Fix a build fail on some environment." This reverts commit 0fdfddf2ac93c1c0238b70a265998fd6b5ffe7af. Conflicts: doc/Makefile.am diff --git a/Makefile.am b/Makefile.am index ed30650..7fa1b76 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 -f $@.tmp; \ + || ($(RM) $@.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 f483bc7..b9c0e31 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 - - at rm $@ - $(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < ''$*.fncs'' > $*.sgml + -rm $@ + $(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < ''$<'' > $*.sgml endif .sgml.txt: $(DOCS_DEPS) - - at rm $@ - $(AM_V_GEN) $(DOC2TXT) $*.sgml + -rm $@ + $(AM_V_GEN) $(DOC2TXT) $< .sgml.pdf: $(DOCS_DEPS) - - at rm $@ - $(AM_V_GEN) $(DOC2PDF) $*.sgml + -rm $@ + $(AM_V_GEN) $(DOC2PDF) $< .sgml.html: $(DOCS_DEPS) - - at rm $@ - $(AM_V_GEN) $(DOC2HTML) -u $*.sgml > $@ + -rm $@ + $(AM_V_GEN) $(DOC2HTML) -u $< > $@ ## fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml - - at rm $@ - $(AM_V_GEN) $(DOC2MAN) local-fontconfig-user.sgml && \ - rm manpage.* + -rm $@ + $(AM_V_GEN) $(DOC2MAN) $< && \ + $(RM) manpage.* ## $(man3_MANS): func.refs func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS) - - at rm $@ + -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 && \ 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},'' $(srcdir)/$@.in | awk ''{if (NR > 1) printf("\n"); printf("%s", $$0);}'' > $@ ## $(HTML_DIR)/*: $(HTML_DIR) $(HTML_DIR): local-fontconfig-devel.sgml $(DOCS_DEPS) - - at rm -r $@ + -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) $(srcdir)/fontconfig-user.sgml $@ diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am index b647c3f..300c966 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} - - at rm $@ - $(AM_V_GEN) $(DOC2MAN) ${SGML} - @rm -f manpage.* + $(RM) $@ + $(DOC2MAN) ${SGML} + $(RM) 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 1855d47..9138c19 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) - - at rm $(TARG) + -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 6bc6168..5874595 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} - - at rm $@ + $(RM) $@ $(DOC2MAN) ${SGML} - @rm -f manpage.* + $(RM) 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 8378707..13b3d7b 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) - - at rm $(TARG) + -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 54fde38..09292bb 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) - - at rm $(TARG) + -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 fb87b50..d40700a 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} - - at rm $@ - $(AM_V_GEN) $(DOC2MAN) ${SGML} - @rm manpage.* + $(RM) $@ + $(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 3bdff6d..94fc7d9 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} - - at rm $@ - $(AM_V_GEN) $(DOC2MAN) ${SGML} - @rm manpage.* + $(RM) $@ + $(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 085c1da..a7db210 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} - - at rm $@ + $(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 31fced9..132dd40 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} - - at rm $@ - $(AM_V_GEN) $(DOC2MAN) ${SGML} - @rm manpage.* + $(RM) $@ + $(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 f36e8f4..c9d8904 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} - - at rm $@ - $(AM_V_GEN) $(DOC2MAN) ${SGML} - @rm manpage.* + $(RM) $@ + $(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 a7bb73c..090f9b1 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)
tagoh at kemper.freedesktop.org (Akira TAGOH) writes:> $< isn''t supported in BSD make say.Yes, it is -- e.g. on FreeBSD''s make and Debian''s pmake: $ cat Makefile .SUFFIXES: .foo .bar .foo.bar: cat $< $< >$@ $ make hello.bar cat hello.foo hello.foo >hello.bar> .sgml.txt: $(DOCS_DEPS) > - -rm $@ > - $(AM_V_GEN) $(DOC2TXT) $< > + $(AM_V_GEN) $(RM) $@; \ > + $(DOC2TXT) $*.sgmlThat rule''s wrong in GNU Make as well -- suffix rules aren''t allowed to have additional prerequisites (see the "Old-Fashioned Suffix Rules" section of the manual). Thanks, -- Adam Sampson <ats at offog.org> <http://offog.org/>
On Fri, Mar 16, 2012 at 9:54 PM, Adam Sampson <ats at offog.org> wrote:> That rule''s wrong in GNU Make as well -- suffix rules aren''t allowed to > have additional prerequisites (see the "Old-Fashioned Suffix Rules" > section of the manual).Indeed. thanks for the comment. I''ll fix that later. -- Akira TAGOH
Alan Coopersmith
2012-Mar-16 14:35 UTC
[Fontconfig] fontconfig: Branch ''master'' - 3 commits
On 03/16/12 12:36 AM, tagoh at kemper.freedesktop.org wrote:> > Fix a build issue due to the use of non-portable variables > > $< isn''t supported in BSD make say.The problem I''ve most commonly seen with projects using $< is that in Solaris make, $< is only supported in suffix rules, not normal rules. I didn''t think BSD make had that restriction though. -- -Alan Coopersmith- alan.coopersmith at oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc
Matthieu Herrb
2012-Mar-16 22:43 UTC
[Fontconfig] fontconfig: Branch ''master'' - 3 commits
On Fri, Mar 16, 2012 at 07:35:49AM -0700, Alan Coopersmith wrote:> On 03/16/12 12:36 AM, tagoh at kemper.freedesktop.org wrote: > > > > Fix a build issue due to the use of non-portable variables > > > > $< isn''t supported in BSD make say. > > The problem I''ve most commonly seen with projects using $< is that in > Solaris make, $< is only supported in suffix rules, not normal rules. > I didn''t think BSD make had that restriction though. >Yes BSD make also has that restriction. But you''re faster than me at fixing those issues in X.Org repositories. So I haven''t had an occasion to say it recently. -- Matthieu Herrb