walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix a build fail on some environment." 

This reverts commit 0fdfddf2ac.

Conflicts:

	doc/Makefile.am
This commit is contained in:
Akira TAGOH 2012-03-16 11:55:30 +09:00
parent 765b7b32d8
commit a5b609196f
13 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -71,7 +71,7 @@ $(srcdir)/ChangeLog:
if test -d "$(srcdir)/.git"; then \ if test -d "$(srcdir)/.git"; then \
(GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \ (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp $@ \ && mv -f $@.tmp $@ \
|| (rm -f $@.tmp; \ || ($(RM) $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
(test -f $@ || echo git-log is required to generate this file >> $@)); \ (test -f $@ || echo git-log is required to generate this file >> $@)); \
else \ else \

30
doc/Makefile.am
View File

@ -155,43 +155,43 @@ if CROSS_COMPILING
@echo Warning: cannot rebuild $@ when cross-compiling @echo Warning: cannot rebuild $@ when cross-compiling
else else
.fncs.sgml: edit-sgml$(EXEEXT) $(srcdir)/func.sgml .fncs.sgml: edit-sgml$(EXEEXT) $(srcdir)/func.sgml
-@rm $@ -rm $@
$(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$*.fncs' > $*.sgml $(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$<' > $*.sgml
endif endif
.sgml.txt: $(DOCS_DEPS) .sgml.txt: $(DOCS_DEPS)
-@rm $@ -rm $@
$(AM_V_GEN) $(DOC2TXT) $*.sgml $(AM_V_GEN) $(DOC2TXT) $<
.sgml.pdf: $(DOCS_DEPS) .sgml.pdf: $(DOCS_DEPS)
-@rm $@ -rm $@
$(AM_V_GEN) $(DOC2PDF) $*.sgml $(AM_V_GEN) $(DOC2PDF) $<
.sgml.html: $(DOCS_DEPS) .sgml.html: $(DOCS_DEPS)
-@rm $@ -rm $@
$(AM_V_GEN) $(DOC2HTML) -u $*.sgml > $@ $(AM_V_GEN) $(DOC2HTML) -u $< > $@
## ##
fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
-@rm $@ -rm $@
$(AM_V_GEN) $(DOC2MAN) local-fontconfig-user.sgml && \ $(AM_V_GEN) $(DOC2MAN) $< && \
rm manpage.* $(RM) manpage.*
## ##
$(man3_MANS): func.refs $(man3_MANS): func.refs
func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS) func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS)
-@rm $@ -rm $@
[ "x$(builddir)" != "x$(srcdir)" ] && \ [ "x$(builddir)" != "x$(srcdir)" ] && \
for f in $(DOC_FUNCS_SGML); do \ for f in $(DOC_FUNCS_SGML); do \
rm -f $(builddir)/$$f || :; \ $(RM) $(builddir)/$$f || :; \
$(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \
done || : done || :
$(AM_V_GEN) $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \ $(AM_V_GEN) $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \
mv devel-man/manpage.refs func.refs && \ mv devel-man/manpage.refs func.refs && \
mv devel-man/*.3 . && \ mv devel-man/*.3 . && \
rm devel-man/manpage.* && \ $(RM) devel-man/manpage.* && \
rmdir devel-man rmdir devel-man
confdir.sgml: $(srcdir)/confdir.sgml.in 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);}' > $@ $(AM_V_GEN) sed -e 's,@CONFDIR\@,${CONFDIR},' $(srcdir)/$@.in | awk '{if (NR > 1) printf("\n"); printf("%s", $$0);}' > $@
## ##
$(HTML_DIR)/*: $(HTML_DIR) $(HTML_DIR)/*: $(HTML_DIR)
$(HTML_DIR): local-fontconfig-devel.sgml $(DOCS_DEPS) $(HTML_DIR): local-fontconfig-devel.sgml $(DOCS_DEPS)
-@rm -r $@ -rm -r $@
$(AM_V_GEN) $(DOC2HTML) -V '%use-id-as-filename%' -o $@ local-fontconfig-devel.sgml $(AM_V_GEN) $(DOC2HTML) -V '%use-id-as-filename%' -o $@ local-fontconfig-devel.sgml
local-fontconfig-user.sgml: $(srcdir)/fontconfig-user.sgml local-fontconfig-user.sgml: $(srcdir)/fontconfig-user.sgml
$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@ $(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@

10
fc-cache/Makefile.am
View File

@ -33,7 +33,7 @@ install-data-local:
-$(mkinstalldirs) "$(DESTDIR)$(fc_cachedir)" -$(mkinstalldirs) "$(DESTDIR)$(fc_cachedir)"
uninstall-local: uninstall-local:
-rm -rf "$(DESTDIR)$(fc_cachedir)" -$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
endif endif
INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS) INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
@ -53,14 +53,14 @@ fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK if USEDOCBOOK
${man_MANS}: ${SGML} ${man_MANS}: ${SGML}
-@rm $@ $(RM) $@
$(AM_V_GEN) $(DOC2MAN) ${SGML} $(DOC2MAN) ${SGML}
@rm -f manpage.* $(RM) manpage.*
all-local: $(man_MANS) all-local: $(man_MANS)
clean-local: clean-local:
-rm $(man_MANS) $(RM) $(man_MANS)
else else
all-local: all-local:

2
fc-case/Makefile.am
View File

@ -46,7 +46,7 @@ $(TARG): $(STMPL) fc-case.c $(SCASEFOLDING)
@echo Warning: cannot rebuild $(TARG) when cross-compiling @echo Warning: cannot rebuild $(TARG) when cross-compiling
else else
$(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING) $(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING)
-@rm $(TARG) -rm $(TARG)
$(AM_V_GEN) $(builddir)/fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \ $(AM_V_GEN) $(builddir)/fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG) mv $(TARG).tmp $(TARG)
endif endif

6
fc-cat/Makefile.am
View File

@ -44,14 +44,14 @@ fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK if USEDOCBOOK
${man_MANS}: ${SGML} ${man_MANS}: ${SGML}
-@rm $@ $(RM) $@
$(DOC2MAN) ${SGML} $(DOC2MAN) ${SGML}
@rm -f manpage.* $(RM) manpage.*
all-local: $(man_MANS) all-local: $(man_MANS)
clean-local: clean-local:
-rm $(man_MANS) $(RM) $(man_MANS)
else else
all-local: all-local:

2
fc-glyphname/Makefile.am
View File

@ -41,7 +41,7 @@ $(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME)
@echo Warning: cannot rebuild $(TARG) when cross-compiling @echo Warning: cannot rebuild $(TARG) when cross-compiling
else else
$(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME) $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME)
-@rm $(TARG) -rm $(TARG)
$(AM_V_GEN) $(builddir)/fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ $(AM_V_GEN) $(builddir)/fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG) mv $(TARG).tmp $(TARG)
endif endif

2
fc-lang/Makefile.am
View File

@ -40,7 +40,7 @@ $(TARG):$(ORTH) fc-lang.c $(STMPL)
@echo Warning: cannot rebuild $(TARG) when cross-compiling @echo Warning: cannot rebuild $(TARG) when cross-compiling
else else
$(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL) $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL)
-@rm $(TARG) -rm $(TARG)
$(AM_V_GEN) $(builddir)/fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ $(AM_V_GEN) $(builddir)/fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG) mv $(TARG).tmp $(TARG)
endif endif

8
fc-list/Makefile.am
View File

@ -44,14 +44,14 @@ fc_list_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK if USEDOCBOOK
${man_MANS}: ${SGML} ${man_MANS}: ${SGML}
-@rm $@ $(RM) $@
$(AM_V_GEN) $(DOC2MAN) ${SGML} $(DOC2MAN) ${SGML}
@rm manpage.* $(RM) manpage.*
all-local: $(man_MANS) all-local: $(man_MANS)
clean-local: clean-local:
-rm $(man_MANS) $(RM) $(man_MANS)
else else
all-local: all-local:

8
fc-match/Makefile.am
View File

@ -44,14 +44,14 @@ fc_match_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK if USEDOCBOOK
${man_MANS}: ${SGML} ${man_MANS}: ${SGML}
-@rm $@ $(RM) $@
$(AM_V_GEN) $(DOC2MAN) ${SGML} $(DOC2MAN) ${SGML}
@rm manpage.* $(RM) manpage.*
all-local: $(man_MANS) all-local: $(man_MANS)
clean-local: clean-local:
-rm $(man_MANS) $(RM) $(man_MANS)
else else
all-local: all-local:

6
fc-pattern/Makefile.am
View File

@ -44,14 +44,14 @@ fc_pattern_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK if USEDOCBOOK
${man_MANS}: ${SGML} ${man_MANS}: ${SGML}
-@rm $@ $(RM) $@
$(DOC2MAN) ${SGML} $(DOC2MAN) ${SGML}
@rm manpage.* $(RM) manpage.*
all-local: $(man_MANS) all-local: $(man_MANS)
clean-local: clean-local:
-rm $(man_MANS) $(RM) $(man_MANS)
else else
all-local: all-local:

8
fc-query/Makefile.am
View File

@ -44,14 +44,14 @@ fc_query_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK if USEDOCBOOK
${man_MANS}: ${SGML} ${man_MANS}: ${SGML}
-@rm $@ $(RM) $@
$(AM_V_GEN) $(DOC2MAN) ${SGML} $(DOC2MAN) ${SGML}
@rm manpage.* $(RM) manpage.*
all-local: $(man_MANS) all-local: $(man_MANS)
clean-local: clean-local:
-rm $(man_MANS) $(RM) $(man_MANS)
else else
all-local: all-local:

8
fc-scan/Makefile.am
View File

@ -44,14 +44,14 @@ fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK if USEDOCBOOK
${man_MANS}: ${SGML} ${man_MANS}: ${SGML}
-@rm $@ $(RM) $@
$(AM_V_GEN) $(DOC2MAN) ${SGML} $(DOC2MAN) ${SGML}
@rm manpage.* $(RM) manpage.*
all-local: $(man_MANS) all-local: $(man_MANS)
clean-local: clean-local:
-rm $(man_MANS) $(RM) $(man_MANS)
else else
all-local: all-local:

2
src/Makefile.am
View File

@ -164,4 +164,4 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
sort; \ sort; \
echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \ echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@ echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
@ ! grep -q FcERROR $@ || (rm $@; false) @ ! grep -q FcERROR $@ || ($(RM) $@; false)