aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-26 08:13:08 +0200
committermarha <marha@users.sourceforge.net>2012-10-26 08:13:08 +0200
commitaf2d8fb974d476eadcd3cde3baebd038f5750600 (patch)
tree9e24173d3f3dacb518a614984d26eaf7e87c7598 /fontconfig
parentf6c8097ba5b5bb714185762dbd0ff9958d23e804 (diff)
parent8d86f8c566c4181c846a872a5a2f88718e635a72 (diff)
downloadvcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.gz
vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.bz2
vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig pixman mesa git update 26 oct 2012
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/fc-cache/Makefile.am7
-rw-r--r--fontconfig/fc-cat/Makefile.am7
-rw-r--r--fontconfig/fc-list/Makefile.am7
-rw-r--r--fontconfig/fc-match/Makefile.am7
-rw-r--r--fontconfig/fc-pattern/Makefile.am7
-rw-r--r--fontconfig/fc-query/Makefile.am7
-rw-r--r--fontconfig/fc-scan/Makefile.am7
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