debian/changelog | 7
debian/xsfbs/xsfbs.mk | 76 ----
debian/xsfbs/xsfbs.sh | 7
mkfontscale/COPYING | 25 +
mkfontscale/ChangeLog | 272 +++++++++++++++--
mkfontscale/Makefile.am | 10
mkfontscale/Makefile.in | 188 ++++++-----
mkfontscale/aclocal.m4 | 238 ++++++++------
mkfontscale/compile | 99 ------
mkfontscale/config.guess | 701 +++++++++++++++++++++++++-------------------
mkfontscale/config.h.in | 9
mkfontscale/config.sub | 278 +++++++++++++----
mkfontscale/configure | 268 +++++++++-------
mkfontscale/configure.ac | 4
mkfontscale/depcomp | 188 +++++++++--
mkfontscale/hash.c | 42 --
mkfontscale/install-sh | 659 +++++++++++++++++++++++++++--------------
mkfontscale/missing | 193 +++++++-----
mkfontscale/mkfontscale.c | 4
mkfontscale/mkfontscale.man | 19 -
mkfontscale/mkinstalldirs | 111 ------
21 files changed, 2045 insertions(+), 1353 deletions(-)
New commits:
commit 0fee501d57ec3e2a2992f5aa6fd6e8c653cb2a43
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 7 17:43:01 2008 +0100
mkfontscale 1.0.4
diff --git a/debian/changelog b/debian/changelog
index d099cbd..71190d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
+
+ * Change versioning to more or less match X.Org katamaris
+ * mkfontscale 1.0.4
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 07 Mar 2008 17:41:15 +0100
+
xfonts-utils (1:1.0.1-2) unstable; urgency=low
* update-fonts-{alias,dir,scale}: stop messing with X11R6 dirs
diff --git a/mkfontscale/COPYING b/mkfontscale/COPYING
index 7f33cbf..31965e8 100644
--- a/mkfontscale/COPYING
+++ b/mkfontscale/COPYING
@@ -1,12 +1,19 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2002-2003 by Juliusz Chroboczek
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/mkfontscale/ChangeLog b/mkfontscale/ChangeLog
index 4498be4..c6f8dfb 100644
--- a/mkfontscale/ChangeLog
+++ b/mkfontscale/ChangeLog
@@ -1,31 +1,265 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 1cb9c0074c5075bbce63ff3601712f34bbb74ca1
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sun Feb 24 21:34:00 2008 -0500
- * configure.ac:
- Update package version for X11R7 release.
+ Bug #11337: Use strcasecmp() instead of broken open-coded version.
+
+ Also, use tolower() instead of broken open-coded version.
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 11651914cb1700528524bd3aabe2372629ce86c8
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Jan 7 14:28:30 2008 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Fix typo in man page
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 963552c24bf90610f2b3e2e77277ad77e2b21210
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Jan 7 14:26:56 2008 -0800
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Convert (1) to (__appmansuffix__) in man page
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3e8bfcc4d87cd26b9426be1ab8941e1a8d709d3c
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Thu Dec 6 16:37:03 2007 -0500
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d59c58bc3e09fd4adf773cd2e0a8c8c0e6018b08
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Mon Sep 3 05:51:05 2007 -0400
- * Makefile.am:
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 73e8b8696e09c2502c2b3f66cbe364a8de14198e
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Thu Aug 23 19:24:29 2007 -0400
- * configure.ac:
- Update package version number for RC1 release.
+ Rename .cvsignore to .gitignore
+commit 08cf5e3544be3a64725e5aacd6209bae32185ff0
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Wed Nov 8 16:29:43 2006 +0200
+
+ bump to 1.0.3
+
+commit b155ad1329e193987ed4102384b7996d6dd45088
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date: Tue Oct 31 16:48:18 2006 +0100
+
+ Allow SemiBold weight for Type 1 fonts.
+ Thanks to Andrey Panov.
+
+commit b849af72d7b564f7c09ee480f7496a741063b2a8
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date: Tue Oct 31 01:35:27 2006 +0100
+
+ Fix typos in manual page, update author's address, update COPYING.
+
+commit 65908e9db4457af1a896d82d5d153655096afb4e
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Oct 13 17:45:45 2006 -0400
+
+ Bump to 1.0.2
+
+commit 72d7891bba975dc637dfcc4df068da4a0afae40c
+Author: Alan Hourihane <[EMAIL PROTECTED]>
+Date: Wed Jul 19 09:47:10 2006 +0100
+
+ open files in binary mode. fixes cygwin issues.
+
+commit 74743bd788dc7d9f65e151142a594dd5dd3679fb
+Author: Jeremy C. Reed <[EMAIL PROTECTED]>
+Date: Thu May 25 23:18:01 2006 +0000
+
+ Check for xproto not x11 (libX11 is not needed).
+
+commit 300ead104133e0967dd2edfd8ef000768e5b2ec5
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Dec 21 02:29:43 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 749ba16c39f2787823d65677c46dd0df10210127
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Dec 19 16:22:41 2005 +0000
+
+ Stub COPYING files
+
+commit f6c3c20921a741d1b8aca31ae4c29105c62e6eb0
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Thu Dec 15 00:24:03 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit db2fd6b3063b161726303f469510edae5552506a
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Dec 6 22:48:17 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 36de3963aaeca770500ca1a0c1677a2a087506d3
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Dec 3 05:49:16 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 35101f83cc13a9989a0a505afbe1557e2eb2b431
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Nov 28 22:01:37 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 7494ff7b73b4bf0b3d01703f2b8d9bcbcb032c89
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Mon Nov 21 10:34:56 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 818a45cd26343f5a90b5861ee3eacaeb7f1b02d9
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Sun Nov 20 22:08:49 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit ff0494da73f7375ef051621c72f6ce91a101574a
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Nov 19 07:15:35 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit cf92d3afb96be73691967875a1e659bfaf47bd5d
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Oct 19 02:47:49 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit c1e504c4af80f9b55d766eeab7f8a76e1043f1f8
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Oct 17 23:56:20 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 8abe389feee29a21ad92277f0a9bc54143102b0b
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Fri Oct 14 00:25:42 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit d2ef439ebff65d9507e8409c32ce83ed24f81c77
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Sat Jul 30 19:32:32 2005 +0000
+
+ Add -D flags to clear more compiler warnings (Stefan Dirsch)
+
+commit d84b476fa167fe34d827f36c0a5e35bca7884136
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Jul 29 21:22:29 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 4ae6c4a84f601196a4cf67dd6f1269c239c757b1
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed Jul 20 19:31:49 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit bdd6bc86322d8769390ce81e74a9c2da103e3533
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Fri Jul 15 00:50:30 2005 +0000
+
+ Add dependency on zlib
+
+commit 30441ee004c0c23d42b76af09e58314aa2218fa3
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Jul 2 21:42:05 2005 +0000
+
+ Add build system for bdftopcf, mkfontdir and mkfontscale
+
+commit 3748201b7bbae3a0c0d20001651430245beab335
+Author: Roland Mainz <[EMAIL PROTECTED]>
+Date: Fri Nov 5 05:01:52 2004 +0000
+
+ xc/fonts/encodings/Imakefile
+ xc/fonts/encodings/ascii-0.enc
+ Adding ascii-0 font encoding which helps in cases where a font has all
+ ASCII chars populated but not enougth glyphs to match the requirements
+ for ISO8859-1 (and to add backwards compatibility to ttmkfdir).
+
+commit 55185f35a75e6aad933e6faedd68bc14dfb94ccc
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Fri Apr 23 19:54:36 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 8e877ebe858657d8de7b5757a6b1d371dbfa6c88
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Sun Mar 14 08:34:54 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit ef2e82cd947202294f2c6cf8e503512bac1452b5
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Wed Mar 3 12:12:53 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit a641a5d0ebd81e83fd6d61cef460b9013229a279
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 13:36:15 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 0bd86c8568761556a0841afff463a2aa5e3f682b
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 09:23:56 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 8b2ffc7720361ca3dd61bda16e384e8258aae803
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Dec 19 20:55:45 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit c76578dc7395126605b9282f8453f1c54f38e61e
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Thu Dec 4 22:03:44 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit 324cfb1744c2c3cc253dd0f63c2252206eb72249
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Tue Nov 25 19:29:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 632e8a138dd16efe41384a4335ec46530da4a04b
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Tue Nov 25 19:29:02 2003 +0000
+
+ Initial revision
+
+commit 7b08fca9270b3735a66f0cf9ce898336a33ea1d6
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:57 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 7d6e5e7aefebf361afb149d7243d09ab6cf54c2f
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:57 2003 +0000
+
+ Initial revision
diff --git a/mkfontscale/Makefile.am b/mkfontscale/Makefile.am
index 1337a07..213031d 100644
--- a/mkfontscale/Makefile.am
+++ b/mkfontscale/Makefile.am
@@ -66,3 +66,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git
directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff --git a/mkfontscale/Makefile.in b/mkfontscale/Makefile.in
index 473579f..8d3fc79 100644
--- a/mkfontscale/Makefile.in
+++ b/mkfontscale/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -36,15 +36,11 @@
# PERFORMANCE OF THIS SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -59,19 +55,18 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = mkfontscale$(EXEEXT)
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- compile config.guess config.sub depcomp install-sh missing \
- mkinstalldirs
-subdir = .
+ config.guess config.sub depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
@@ -82,7 +77,9 @@ am_mkfontscale_OBJECTS = mkfontscale-hash.$(OBJEXT) \
mkfontscale-mkfontscale.$(OBJEXT)
mkfontscale_OBJECTS = $(am_mkfontscale_OBJECTS)
mkfontscale_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+mkfontscale_LINK = $(CCLD) $(mkfontscale_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = [EMAIL PROTECTED]@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -115,8 +112,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -139,6 +134,7 @@ ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -150,11 +146,10 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
MKFONTSCALE_CFLAGS = @MKFONTSCALE_CFLAGS@
MKFONTSCALE_LIBS = @MKFONTSCALE_LIBS@
OBJEXT = @OBJEXT@
@@ -172,9 +167,11 @@ STRIP = @STRIP@
VERSION = @VERSION@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -186,6 +183,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -213,8 +211,11 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
mkfontscale_LDADD = @MKFONTSCALE_LIBS@
mkfontscale_SOURCES = \
@@ -230,7 +231,7 @@ mkfontscale_SOURCES = \
appman_PRE = mkfontscale.man
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
SED = sed
@@ -251,6 +252,7 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -293,7 +295,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -308,7 +310,7 @@ distclean-hdr:
-rm -f config.h stamp-h1
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -331,7 +333,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
mkfontscale$(EXEEXT): $(mkfontscale_OBJECTS) $(mkfontscale_DEPENDENCIES)
@rm -f mkfontscale$(EXEEXT)
- $(LINK) $(mkfontscale_LDFLAGS) $(mkfontscale_OBJECTS)
$(mkfontscale_LDADD) $(LIBS)
+ $(mkfontscale_LINK) $(mkfontscale_OBJECTS) $(mkfontscale_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -345,78 +347,77 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
.c.o:
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
[EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@
$<
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
[EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@
`$(CYGPATH_W) '$<'`
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
mkfontscale-hash.o: hash.c
[EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-hash.o -MD -MP -MF "$(DEPDIR)/mkfontscale-hash.Tpo" -c -o
mkfontscale-hash.o `test -f 'hash.c' || echo '$(srcdir)/'`hash.c; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/mkfontscale-hash.Tpo"
"$(DEPDIR)/mkfontscale-hash.Po"; else rm -f "$(DEPDIR)/mkfontscale-hash.Tpo";
exit 1; fi
[EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-hash.o -MD -MP -MF $(DEPDIR)/mkfontscale-hash.Tpo -c -o
mkfontscale-hash.o `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/mkfontscale-hash.Tpo
$(DEPDIR)/mkfontscale-hash.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hash.c'
object='mkfontscale-hash.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -c -o
mkfontscale-hash.o `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
mkfontscale-hash.obj: hash.c
[EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-hash.obj -MD -MP -MF "$(DEPDIR)/mkfontscale-hash.Tpo" -c -o
mkfontscale-hash.obj `if test -f 'hash.c'; then $(CYGPATH_W) 'hash.c'; else
$(CYGPATH_W) '$(srcdir)/hash.c'; fi`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/mkfontscale-hash.Tpo"
"$(DEPDIR)/mkfontscale-hash.Po"; else rm -f "$(DEPDIR)/mkfontscale-hash.Tpo";
exit 1; fi
[EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-hash.obj -MD -MP -MF $(DEPDIR)/mkfontscale-hash.Tpo -c -o
mkfontscale-hash.obj `if test -f 'hash.c'; then $(CYGPATH_W) 'hash.c'; else
$(CYGPATH_W) '$(srcdir)/hash.c'; fi`
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/mkfontscale-hash.Tpo
$(DEPDIR)/mkfontscale-hash.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hash.c'
object='mkfontscale-hash.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -c -o
mkfontscale-hash.obj `if test -f 'hash.c'; then $(CYGPATH_W) 'hash.c'; else
$(CYGPATH_W) '$(srcdir)/hash.c'; fi`
mkfontscale-ident.o: ident.c
[EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-ident.o -MD -MP -MF "$(DEPDIR)/mkfontscale-ident.Tpo" -c -o
mkfontscale-ident.o `test -f 'ident.c' || echo '$(srcdir)/'`ident.c; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/mkfontscale-ident.Tpo"
"$(DEPDIR)/mkfontscale-ident.Po"; else rm -f "$(DEPDIR)/mkfontscale-ident.Tpo";
exit 1; fi
[EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-ident.o -MD -MP -MF $(DEPDIR)/mkfontscale-ident.Tpo -c -o
mkfontscale-ident.o `test -f 'ident.c' || echo '$(srcdir)/'`ident.c
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/mkfontscale-ident.Tpo
$(DEPDIR)/mkfontscale-ident.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ident.c'
object='mkfontscale-ident.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -c -o
mkfontscale-ident.o `test -f 'ident.c' || echo '$(srcdir)/'`ident.c
mkfontscale-ident.obj: ident.c
[EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-ident.obj -MD -MP -MF "$(DEPDIR)/mkfontscale-ident.Tpo" -c -o
mkfontscale-ident.obj `if test -f 'ident.c'; then $(CYGPATH_W) 'ident.c'; else
$(CYGPATH_W) '$(srcdir)/ident.c'; fi`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/mkfontscale-ident.Tpo"
"$(DEPDIR)/mkfontscale-ident.Po"; else rm -f "$(DEPDIR)/mkfontscale-ident.Tpo";
exit 1; fi
[EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-ident.obj -MD -MP -MF $(DEPDIR)/mkfontscale-ident.Tpo -c -o
mkfontscale-ident.obj `if test -f 'ident.c'; then $(CYGPATH_W) 'ident.c'; else
$(CYGPATH_W) '$(srcdir)/ident.c'; fi`
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/mkfontscale-ident.Tpo
$(DEPDIR)/mkfontscale-ident.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ident.c'
object='mkfontscale-ident.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -c -o
mkfontscale-ident.obj `if test -f 'ident.c'; then $(CYGPATH_W) 'ident.c'; else
$(CYGPATH_W) '$(srcdir)/ident.c'; fi`
mkfontscale-list.o: list.c
[EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-list.o -MD -MP -MF "$(DEPDIR)/mkfontscale-list.Tpo" -c -o
mkfontscale-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/mkfontscale-list.Tpo"
"$(DEPDIR)/mkfontscale-list.Po"; else rm -f "$(DEPDIR)/mkfontscale-list.Tpo";
exit 1; fi
[EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-list.o -MD -MP -MF $(DEPDIR)/mkfontscale-list.Tpo -c -o
mkfontscale-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/mkfontscale-list.Tpo
$(DEPDIR)/mkfontscale-list.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='list.c'
object='mkfontscale-list.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -c -o
mkfontscale-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c
mkfontscale-list.obj: list.c
[EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-list.obj -MD -MP -MF "$(DEPDIR)/mkfontscale-list.Tpo" -c -o
mkfontscale-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else
$(CYGPATH_W) '$(srcdir)/list.c'; fi`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/mkfontscale-list.Tpo"
"$(DEPDIR)/mkfontscale-list.Po"; else rm -f "$(DEPDIR)/mkfontscale-list.Tpo";
exit 1; fi
[EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-list.obj -MD -MP -MF $(DEPDIR)/mkfontscale-list.Tpo -c -o
mkfontscale-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else
$(CYGPATH_W) '$(srcdir)/list.c'; fi`
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/mkfontscale-list.Tpo
$(DEPDIR)/mkfontscale-list.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='list.c'
object='mkfontscale-list.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -c -o
mkfontscale-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else
$(CYGPATH_W) '$(srcdir)/list.c'; fi`
mkfontscale-mkfontscale.o: mkfontscale.c
[EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-mkfontscale.o -MD -MP -MF "$(DEPDIR)/mkfontscale-mkfontscale.Tpo"
-c -o mkfontscale-mkfontscale.o `test -f 'mkfontscale.c' || echo
'$(srcdir)/'`mkfontscale.c; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/mkfontscale-mkfontscale.Tpo"
"$(DEPDIR)/mkfontscale-mkfontscale.Po"; else rm -f
"$(DEPDIR)/mkfontscale-mkfontscale.Tpo"; exit 1; fi
[EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-mkfontscale.o -MD -MP -MF $(DEPDIR)/mkfontscale-mkfontscale.Tpo -c
-o mkfontscale-mkfontscale.o `test -f 'mkfontscale.c' || echo
'$(srcdir)/'`mkfontscale.c
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/mkfontscale-mkfontscale.Tpo
$(DEPDIR)/mkfontscale-mkfontscale.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mkfontscale.c'
object='mkfontscale-mkfontscale.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -c -o
mkfontscale-mkfontscale.o `test -f 'mkfontscale.c' || echo
'$(srcdir)/'`mkfontscale.c
mkfontscale-mkfontscale.obj: mkfontscale.c
[EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-mkfontscale.obj -MD -MP -MF "$(DEPDIR)/mkfontscale-mkfontscale.Tpo"
-c -o mkfontscale-mkfontscale.obj `if test -f 'mkfontscale.c'; then
$(CYGPATH_W) 'mkfontscale.c'; else $(CYGPATH_W) '$(srcdir)/mkfontscale.c'; fi`;
\
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/mkfontscale-mkfontscale.Tpo"
"$(DEPDIR)/mkfontscale-mkfontscale.Po"; else rm -f
"$(DEPDIR)/mkfontscale-mkfontscale.Tpo"; exit 1; fi
[EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -MT
mkfontscale-mkfontscale.obj -MD -MP -MF $(DEPDIR)/mkfontscale-mkfontscale.Tpo
-c -o mkfontscale-mkfontscale.obj `if test -f 'mkfontscale.c'; then
$(CYGPATH_W) 'mkfontscale.c'; else $(CYGPATH_W) '$(srcdir)/mkfontscale.c'; fi`
[EMAIL PROTECTED]@ mv -f $(DEPDIR)/mkfontscale-mkfontscale.Tpo
$(DEPDIR)/mkfontscale-mkfontscale.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mkfontscale.c'
object='mkfontscale-mkfontscale.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(mkfontscale_CFLAGS) $(CFLAGS) -c -o
mkfontscale-mkfontscale.obj `if test -f 'mkfontscale.c'; then $(CYGPATH_W)
'mkfontscale.c'; else $(CYGPATH_W) '$(srcdir)/mkfontscale.c'; fi`
-uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
- test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
+ test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
@list='$(appman_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -437,8 +438,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -450,8 +451,8 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in
$(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -461,13 +462,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -482,23 +482,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -509,10 +508,13 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {}
\; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
@@ -521,6 +523,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -548,6 +554,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -587,7 +595,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -611,7 +619,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(DATA) config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -638,6 +646,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -661,12 +670,20 @@ info-am:
install-data-am: install-appmanDATA
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -688,27 +705,36 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
- uninstall-info-am
+uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-appmanDATA install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-compile distclean-generic \
+ distclean-hdr distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-appmanDATA install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
- uninstall-info-am
+ uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git
directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/mkfontscale/aclocal.m4 b/mkfontscale/aclocal.m4
index 398f56a..e5b3eb6 100644
--- a/mkfontscale/aclocal.m4
+++ b/mkfontscale/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically
`autoreconf'.])])
+
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
# Copyright © 2004 Scott James Remnant <[EMAIL PROTECTED]>.
@@ -79,16 +87,14 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -132,9 +138,9 @@ See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout
--print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2"
2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -159,7 +165,7 @@ path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -216,7 +222,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed
's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e
's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least
${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.2
+ [XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//'
-e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -365,7 +371,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -620,7 +630,8 @@ dnl
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -633,9 +644,26 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
