From 038aa930ae2c3b7972eefe334917e7222fe478ec Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 26 Oct 2012 14:31:23 +0900 Subject: [PATCH] Use automake variable instead of cleaning files in clean-local just for git.mk coming up from Behdad's threadsafe branch --- fc-cache/Makefile.am | 7 +++---- fc-cat/Makefile.am | 7 +++---- fc-list/Makefile.am | 7 +++---- fc-match/Makefile.am | 7 +++---- fc-pattern/Makefile.am | 7 +++---- fc-query/Makefile.am | 7 +++---- fc-scan/Makefile.am | 7 +++---- 7 files changed, 21 insertions(+), 28 deletions(-) diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am index 8f455c8..61f5019 100644 --- a/fc-cache/Makefile.am +++ b/fc-cache/Makefile.am @@ -48,6 +48,8 @@ endif EXTRA_DIST=fc-cache.sgml $(BUILT_MANS) +CLEANFILES = + fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK @@ -59,10 +61,7 @@ ${man_MANS}: ${SGML} all-local: $(man_MANS) -clean-local: - $(RM) $(man_MANS) - +CLEANFILES += ${man_MANS} else all-local: -clean-local: endif diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am index 8a2939a..7b52d49 100644 --- a/fc-cat/Makefile.am +++ b/fc-cat/Makefile.am @@ -39,6 +39,8 @@ endif EXTRA_DIST=fc-cat.sgml ${BUILT_MANS} +CLEANFILES = + fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK @@ -50,10 +52,7 @@ ${man_MANS}: ${SGML} all-local: $(man_MANS) -clean-local: - $(RM) $(man_MANS) - +CLEANFILES += ${man_MANS} else all-local: -clean-local: endif diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am index 7822ad4..8b13568 100644 --- a/fc-list/Makefile.am +++ b/fc-list/Makefile.am @@ -39,6 +39,8 @@ endif EXTRA_DIST=fc-list.sgml $(BUILT_MANS) +CLEANFILES = + fc_list_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK @@ -50,10 +52,7 @@ ${man_MANS}: ${SGML} all-local: $(man_MANS) -clean-local: - $(RM) $(man_MANS) - +CLEANFILES += ${man_MANS} else all-local: -clean-local: endif diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am index d046b79..4066c9e 100644 --- a/fc-match/Makefile.am +++ b/fc-match/Makefile.am @@ -39,6 +39,8 @@ endif EXTRA_DIST=fc-match.sgml $(BUILT_MANS) +CLEANFILES = + fc_match_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK @@ -50,10 +52,7 @@ ${man_MANS}: ${SGML} all-local: $(man_MANS) -clean-local: - $(RM) $(man_MANS) - +CLEANFILES += ${man_MANS} else all-local: -clean-local: endif diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am index fa66006..c97db12 100644 --- a/fc-pattern/Makefile.am +++ b/fc-pattern/Makefile.am @@ -39,6 +39,8 @@ endif EXTRA_DIST=fc-pattern.sgml $(BUILT_MANS) +CLEANFILES = + fc_pattern_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK @@ -50,10 +52,7 @@ ${man_MANS}: ${SGML} all-local: $(man_MANS) -clean-local: - $(RM) $(man_MANS) - +CLEANFILES += ${man_MANS} else all-local: -clean-local: endif diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am index f60c363..4271252 100644 --- a/fc-query/Makefile.am +++ b/fc-query/Makefile.am @@ -39,6 +39,8 @@ endif EXTRA_DIST=fc-query.sgml $(BUILT_MANS) +CLEANFILES = + fc_query_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK @@ -50,10 +52,7 @@ ${man_MANS}: ${SGML} all-local: $(man_MANS) -clean-local: - $(RM) $(man_MANS) - +CLEANFILES += ${man_MANS} else all-local: -clean-local: endif diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am index 8909691..22136b1 100644 --- a/fc-scan/Makefile.am +++ b/fc-scan/Makefile.am @@ -39,6 +39,8 @@ endif EXTRA_DIST=fc-scan.sgml $(BUILT_MANS) +CLEANFILES = + fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la if USEDOCBOOK @@ -50,10 +52,7 @@ ${man_MANS}: ${SGML} all-local: $(man_MANS) -clean-local: - $(RM) $(man_MANS) - +CLEANFILES += ${man_MANS} else all-local: -clean-local: endif