Synchronised line endinge with release branch

1 files changed, 57 insertions, 57 deletions

diff --git a/mkfontscale/Makefile.am b/mkfontscale/Makefile.am
index 381a1f3d1..e276fec13 100644
--- a/mkfontscale/Makefile.am
+++ b/mkfontscale/Makefile.am
@@ -1,57 +1,57 @@
-# 

-#  Copyright 2005  Red Hat, Inc.

-# 

-#  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 Red Hat not be used in

-#  advertising or publicity pertaining to distribution of the software

-#  without specific, written prior permission.  Red Hat makes no

-#  representations about the suitability of this software for any

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

-# 

-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

-#  NO EVENT SHALL RED HAT 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.

-

-SUBDIRS = man

-bin_PROGRAMS = mkfontscale

-

-AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE

-AM_CFLAGS = $(CWARNFLAGS)

-mkfontscale_LDADD  = @MKFONTSCALE_LIBS@

-

-mkfontscale_SOURCES = \

-	data.h \

-	hash.c \

-	hash.h \

-	ident.c \

-	ident.h \

-	list.c \

-	list.h \

-	mkfontscale.c

-

-MAINTAINERCLEANFILES = ChangeLog INSTALL

-

-.PHONY: ChangeLog INSTALL

-

-INSTALL:

-	$(INSTALL_CMD)

-

-ChangeLog:

-	$(CHANGELOG_CMD)

-

-dist-hook: ChangeLog INSTALL

-

-if LINT

-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

-		$(AM_CPPFLAGS) $(CPPFLAGS)

-

-lint:

-	$(LINT) $(ALL_LINT_FLAGS) $(mkfontscale_SOURCES)

-endif LINT

+# 
+#  Copyright 2005  Red Hat, Inc.
+# 
+#  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 Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software
+#  without specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any
+#  purpose.  It is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+#  NO EVENT SHALL RED HAT 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.
+
+SUBDIRS = man
+bin_PROGRAMS = mkfontscale
+
+AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
+AM_CFLAGS = $(CWARNFLAGS)
+mkfontscale_LDADD  = @MKFONTSCALE_LIBS@
+
+mkfontscale_SOURCES = \
+	data.h \
+	hash.c \
+	hash.h \
+	ident.c \
+	ident.h \
+	list.c \
+	list.h \
+	mkfontscale.c
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+		$(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+	$(LINT) $(ALL_LINT_FLAGS) $(mkfontscale_SOURCES)
+endif LINT