Synchronised line endinge with release branch

1 files changed, 68 insertions, 68 deletions

diff --git a/fontconfig/fc-cache/Makefile.am b/fontconfig/fc-cache/Makefile.am
index 4402d8952..300c96697 100644
--- a/fontconfig/fc-cache/Makefile.am
+++ b/fontconfig/fc-cache/Makefile.am
@@ -1,68 +1,68 @@
-# 

-#  fontconfig/fc-cache/Makefile.am

-# 

-#  Copyright © 2003 Keith Packard

-# 

-#  Permission to use, copy, modify, distribute, and sell this software and its

-#  documentation for any purpose is hereby granted without fee, provided that

-#  the above copyright notice appear in all copies and that both that

-#  copyright notice and this permission notice appear in supporting

-#  documentation, and that the name of the author(s) not be used in

-#  advertising or publicity pertaining to distribution of the software without

-#  specific, written prior permission.  The authors make no

-#  representations about the suitability of this software for any purpose.  It

-#  is provided "as is" without express or implied warranty.

-# 

-#  THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

-#  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

-#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

-#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-#  PERFORMANCE OF THIS SOFTWARE.

-

-DOC2MAN = docbook2man

-

-FC_CACHE_SRC=${top_srcdir}/fc-cache

-

-SGML = ${FC_CACHE_SRC}/fc-cache.sgml

-

-if OS_WIN32

-else

-install-data-local:

-	-$(mkinstalldirs) "$(DESTDIR)$(fc_cachedir)"

-

-uninstall-local:

-	-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"

-endif

-

-INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)

-

-bin_PROGRAMS=fc-cache

-

-BUILT_MANS=fc-cache.1

-

-if ENABLE_DOCS

-man_MANS=${BUILT_MANS}

-endif

-

-EXTRA_DIST=fc-cache.sgml $(BUILT_MANS)

-

-fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la

-

-if USEDOCBOOK

-

-${man_MANS}: ${SGML}	

-	$(RM) $@

-	$(DOC2MAN) ${SGML}

-	$(RM) manpage.*

-

-all-local: $(man_MANS)

-

-clean-local:

-	$(RM) $(man_MANS)

-

-else

-all-local:

-clean-local:

-endif

+# 
+#  fontconfig/fc-cache/Makefile.am
+# 
+#  Copyright © 2003 Keith Packard
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of the author(s) not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  The authors make no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+DOC2MAN = docbook2man
+
+FC_CACHE_SRC=${top_srcdir}/fc-cache
+
+SGML = ${FC_CACHE_SRC}/fc-cache.sgml
+
+if OS_WIN32
+else
+install-data-local:
+	-$(mkinstalldirs) "$(DESTDIR)$(fc_cachedir)"
+
+uninstall-local:
+	-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
+endif
+
+INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
+
+bin_PROGRAMS=fc-cache
+
+BUILT_MANS=fc-cache.1
+
+if ENABLE_DOCS
+man_MANS=${BUILT_MANS}
+endif
+
+EXTRA_DIST=fc-cache.sgml $(BUILT_MANS)
+
+fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
+
+if USEDOCBOOK
+
+${man_MANS}: ${SGML}	
+	$(RM) $@
+	$(DOC2MAN) ${SGML}
+	$(RM) manpage.*
+
+all-local: $(man_MANS)
+
+clean-local:
+	$(RM) $(man_MANS)
+
+else
+all-local:
+clean-local:
+endif