summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am10
-rw-r--r--conf.d/Makefile.am8
-rw-r--r--configure.in9
-rw-r--r--doc/Makefile.am32
-rw-r--r--fc-cache/Makefile.am4
-rw-r--r--fc-case/Makefile.am6
-rw-r--r--fc-cat/Makefile.am4
-rw-r--r--fc-list/Makefile.am4
-rw-r--r--fc-match/Makefile.am4
-rw-r--r--fc-pattern/Makefile.am4
-rw-r--r--fc-query/Makefile.am4
-rw-r--r--fc-scan/Makefile.am4
-rw-r--r--src/Makefile.am8
13 files changed, 54 insertions, 47 deletions
diff --git a/Makefile.am b/Makefile.am
index 7fa1b762..9342f8e8 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 d122a8ff..13f243bb 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 da6ef953..3204f2e5 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 b9c0e31a..02ff25c1 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 300c9669..8f455c8e 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 de657afa..ad5dc74b 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 58745959..8a2939ae 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 d40700a4..7822ad47 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 94fc7d90..d046b793 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 a7db2105..fa66006c 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 132dd401..f60c3630 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 c9d8904a..8909691a 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 090f9b1a..fb30cd59 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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 18:31:25 +0000