Synchronised line endinge with release branch

1 files changed, 68 insertions, 68 deletions

diff --git a/libXfont/src/Makefile.am b/libXfont/src/Makefile.am
index 3f6575e99..26551bc04 100644
--- a/libXfont/src/Makefile.am
+++ b/libXfont/src/Makefile.am
@@ -1,68 +1,68 @@
-# 

-#  Copyright © 2003 Keith Packard, Noah Levitt

-# 

-#  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 Keith Packard not be used in

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

-#  specific, written prior permission.  Keith Packard makes no

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

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

-# 

-#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

-#  EVENT SHALL KEITH PACKARD 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.

-

-lib_LTLIBRARIES = libXfont.la

-

-AM_CFLAGS = $(OS_CFLAGS) $(CWARNFLAGS)

-

-if XFONT_FONTFILE

-FONTFILE_DIR = fontfile

-FONTFILE_LIB = fontfile/libfontfile.la

-endif

-

-if XFONT_FREETYPE

-FREETYPE_DIR = FreeType

-FREETYPE_LIB = FreeType/libft.la

-endif

-

-if XFONT_BITMAP

-BITMAP_DIR = bitmap

-BITMAP_LIB = bitmap/libbitmap.la

-endif

-

-if XFONT_BUILTINS

-BUILTINS_DIR = builtins

-BUILTINS_LIB = builtins/libbuiltins.la

-endif

-

-if XFONT_FC

-FC_DIR = fc

-FC_LIB = fc/libfc.la

-endif

-

-UTIL_DIR = util

-UTIL_LIB = util/libutil.la

-

-STUBS_LIB = stubs/libstubs.la

-STUBS_DIR = stubs

-

-SUBDIRS=\

-	$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \

-	$(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR)

-

-libXfont_la_LIBADD = \

-	$(FONTFILE_LIB) $(FREETYPE_LIB) $(BITMAP_LIB) \

-	$(BUILTINS_LIB) $(FC_LIB) $(UTIL_LIB) $(STUBS_LIB) \

-	$(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS)

-

-libXfont_la_SOURCES = dummy.c

-

-libXfont_la_LDFLAGS = -version-number 1:4:1

+# 
+#  Copyright © 2003 Keith Packard, Noah Levitt
+# 
+#  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 Keith Packard not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Keith Packard makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL KEITH PACKARD 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.
+
+lib_LTLIBRARIES = libXfont.la
+
+AM_CFLAGS = $(OS_CFLAGS) $(CWARNFLAGS)
+
+if XFONT_FONTFILE
+FONTFILE_DIR = fontfile
+FONTFILE_LIB = fontfile/libfontfile.la
+endif
+
+if XFONT_FREETYPE
+FREETYPE_DIR = FreeType
+FREETYPE_LIB = FreeType/libft.la
+endif
+
+if XFONT_BITMAP
+BITMAP_DIR = bitmap
+BITMAP_LIB = bitmap/libbitmap.la
+endif
+
+if XFONT_BUILTINS
+BUILTINS_DIR = builtins
+BUILTINS_LIB = builtins/libbuiltins.la
+endif
+
+if XFONT_FC
+FC_DIR = fc
+FC_LIB = fc/libfc.la
+endif
+
+UTIL_DIR = util
+UTIL_LIB = util/libutil.la
+
+STUBS_LIB = stubs/libstubs.la
+STUBS_DIR = stubs
+
+SUBDIRS=\
+	$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
+	$(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR)
+
+libXfont_la_LIBADD = \
+	$(FONTFILE_LIB) $(FREETYPE_LIB) $(BITMAP_LIB) \
+	$(BUILTINS_LIB) $(FC_LIB) $(UTIL_LIB) $(STUBS_LIB) \
+	$(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS)
+
+libXfont_la_SOURCES = dummy.c
+
+libXfont_la_LDFLAGS = -version-number 1:4:1