fontconfig pixman mesa git update 26 oct 2012

fontconfig: 038aa930ae2c3b7972eefe334917e7222fe478ec
mesa: 8fb4b1dce156d02a0907925364d8945915c29bcf
pixman: 4b91f6ca72db3e8cbd7e97e9ef44be2f8994040d

7 files changed, 21 insertions, 28 deletions

diff --git a/fontconfig/fc-cache/Makefile.am b/fontconfig/fc-cache/Makefile.am
index 8f455c8e2..61f5019fb 100644
--- a/fontconfig/fc-cache/Makefile.am
+++ b/fontconfig/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/fontconfig/fc-cat/Makefile.am b/fontconfig/fc-cat/Makefile.am
index 8a2939aef..7b52d49b6 100644
--- a/fontconfig/fc-cat/Makefile.am
+++ b/fontconfig/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/fontconfig/fc-list/Makefile.am b/fontconfig/fc-list/Makefile.am
index 7822ad479..8b1356817 100644
--- a/fontconfig/fc-list/Makefile.am
+++ b/fontconfig/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/fontconfig/fc-match/Makefile.am b/fontconfig/fc-match/Makefile.am
index d046b7934..4066c9e38 100644
--- a/fontconfig/fc-match/Makefile.am
+++ b/fontconfig/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/fontconfig/fc-pattern/Makefile.am b/fontconfig/fc-pattern/Makefile.am
index fa66006cd..c97db12a9 100644
--- a/fontconfig/fc-pattern/Makefile.am
+++ b/fontconfig/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/fontconfig/fc-query/Makefile.am b/fontconfig/fc-query/Makefile.am
index f60c3630e..4271252e4 100644
--- a/fontconfig/fc-query/Makefile.am
+++ b/fontconfig/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/fontconfig/fc-scan/Makefile.am b/fontconfig/fc-scan/Makefile.am
index 8909691a0..22136b16b 100644
--- a/fontconfig/fc-scan/Makefile.am
+++ b/fontconfig/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