svn merge ^/branches/released .

1 files changed, 57 insertions, 84 deletions

diff --git a/mkfontscale/Makefile.am b/mkfontscale/Makefile.am
index 57abbf69a..381a1f3d1 100644
--- a/mkfontscale/Makefile.am
+++ b/mkfontscale/Makefile.am
@@ -1,84 +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.
-
-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
-
-appman_PRE = mkfontscale.man
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
-CLEANFILES = $(appman_DATA)
-
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xservername__|Xorg|g' \
-	-e 's|__xconfigfile__|xorg.conf|g' \
-	-e 's|__projectroot__|$(prefix)|g' \
-	-e 's|__apploaddir__|$(appdefaultdir)|' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-.PHONY: ChangeLog
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog
-
-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