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

Get rid of $< from Makefile.am

This commit is contained in:
Akira TAGOH 2012-03-11 02:12:10 +09:00
parent 0fdfddf2ac
commit 3b142c2aae
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -89,7 +89,7 @@ fonts.conf: fonts.conf.in Makefile
-e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \ -e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \
-e 's,@PACKAGE\@,$(PACKAGE),g' \ -e 's,@PACKAGE\@,$(PACKAGE),g' \
-e 's,@VERSION\@,$(VERSION),g' \ -e 's,@VERSION\@,$(VERSION),g' \
$< > $@.tmp && \ $(srcdir)/$@.in > $@.tmp && \
mv $@.tmp $@ mv $@.tmp $@
install-data-local: fonts.conf install-data-local: fonts.conf

16
doc/Makefile.am
View File

@ -156,21 +156,21 @@ if 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 < '$<' > $*.sgml $(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$*.fncs' > $*.sgml
endif endif
.sgml.txt: $(DOCS_DEPS) .sgml.txt: $(DOCS_DEPS)
-@rm $@ -@rm $@
$(AM_V_GEN) $(DOC2TXT) $< $(AM_V_GEN) $(DOC2TXT) $*.sgml
.sgml.pdf: $(DOCS_DEPS) .sgml.pdf: $(DOCS_DEPS)
-@rm $@ -@rm $@
$(AM_V_GEN) $(DOC2PDF) $< $(AM_V_GEN) $(DOC2PDF) $*.sgml
.sgml.html: $(DOCS_DEPS) .sgml.html: $(DOCS_DEPS)
-@rm $@ -@rm $@
$(AM_V_GEN) $(DOC2HTML) -u $< > $@ $(AM_V_GEN) $(DOC2HTML) -u $*.sgml > $@
## ##
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) $< && \ $(AM_V_GEN) $(DOC2MAN) local-fontconfig-user.sgml && \
rm manpage.* rm manpage.*
## ##
$(man3_MANS): func.refs $(man3_MANS): func.refs
@ -187,16 +187,16 @@ func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS)
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},' $< | 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) $< $@ $(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@
local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml
$(AM_V_GEN) $(LN_S) $< $@ $(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-devel.sgml $@
# #
all-local: $(BUILT_DOCS) $(HTML_DIR)/* all-local: $(BUILT_DOCS) $(HTML_DIR)/*
clean-local: clean-local: