Makefile.am | 2 +-
doc/Makefile.am | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 3b142c2aaeaed4d6d5b3353aa1007d6ac08dbbdb
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Sun Mar 11 02:12:10 2012 +0900
Get rid of $< from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 3074001..ed30650 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,7 +89,7 @@ fonts.conf: fonts.conf.in Makefile
-e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \
-e 's,@PACKAGE\@,$(PACKAGE),g' \
-e 's,@VERSION\@,$(VERSION),g' \
- $< > $@.tmp && \
+ $(srcdir)/$@.in > $@.tmp && \
mv $@.tmp $@
install-data-local: fonts.conf
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a29b0cd..f483bc7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -156,21 +156,21 @@ if 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) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$*.fncs' > $*.sgml
endif
.sgml.txt: $(DOCS_DEPS)
-@rm $@
- $(AM_V_GEN) $(DOC2TXT) $<
+ $(AM_V_GEN) $(DOC2TXT) $*.sgml
.sgml.pdf: $(DOCS_DEPS)
-@rm $@
- $(AM_V_GEN) $(DOC2PDF) $<
+ $(AM_V_GEN) $(DOC2PDF) $*.sgml
.sgml.html: $(DOCS_DEPS)
-@rm $@
- $(AM_V_GEN) $(DOC2HTML) -u $< > $@
+ $(AM_V_GEN) $(DOC2HTML) -u $*.sgml > $@
##
fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
-@rm $@
- $(AM_V_GEN) $(DOC2MAN) $< && \
+ $(AM_V_GEN) $(DOC2MAN) local-fontconfig-user.sgml && \
rm manpage.*
##
$(man3_MANS): func.refs
@@ -187,16 +187,16 @@ func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS)
rm devel-man/manpage.* && \
rmdir devel-man
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): local-fontconfig-devel.sgml $(DOCS_DEPS)
-@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) $< $@
+ $(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.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)/*
clean-local:
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
