xfonts-utils: Changes to 'debian-unstable'
bdftopcf/ChangeLog | 45
bdftopcf/Makefile.am | 6
bdftopcf/Makefile.in | 369 +-
bdftopcf/README | 24
bdftopcf/aclocal.m4 | 697 +++--
bdftopcf/compile | 142 -
bdftopcf/config.guess | 101
bdftopcf/config.h.in | 30
bdftopcf/config.sub | 109
bdftopcf/configure | 4406 ++++++++++++++++++++++------------
bdftopcf/configure.ac | 10
bdftopcf/depcomp | 172 +
bdftopcf/install-sh | 517 ++-
bdftopcf/missing | 104
debian/changelog | 13
debian/copyright | 196 -
debian/rules | 5
debian/watch.bdftopcf | 2
debian/watch.font-util | 2
debian/watch.fonttosfnt | 2
debian/watch.mkfontdir | 2
debian/watch.mkfontscale | 2
debian/xfonts-utils.lintian-overrides | 1
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 233 -
font-util/COPYING | 29
font-util/ChangeLog | 61
font-util/Makefile.am | 2
font-util/Makefile.in | 328 +-
font-util/README | 5
font-util/aclocal.m4 | 1469 ++++++-----
font-util/bdftruncate.c | 4
font-util/config.guess | 58
font-util/config.h.in | 3
font-util/config.sub | 15
font-util/configure | 4163 ++++++++++++++++++++------------
font-util/configure.ac | 33
font-util/depcomp | 87
font-util/fontutil.m4 | 441 ++-
font-util/fontutil.m4.in | 324 ++
font-util/fontutil.pc.in | 3
font-util/install-sh | 5
font-util/missing | 49
mkfontdir/ChangeLog | 36
mkfontdir/Makefile.am | 8
mkfontdir/Makefile.in | 223 +
mkfontdir/README | 27
mkfontdir/aclocal.m4 | 1570 +++++++-----
mkfontdir/config.guess | 55
mkfontdir/config.sub | 54
mkfontdir/configure | 4186 ++++++++++++++++++++++++++------
mkfontdir/configure.ac | 11
mkfontdir/install-sh | 5
mkfontdir/missing | 49
mkfontscale/COPYING | 28
mkfontscale/ChangeLog | 66
mkfontscale/Makefile.am | 18
mkfontscale/Makefile.in | 341 +-
mkfontscale/README | 26
mkfontscale/aclocal.m4 | 1737 +++++++------
mkfontscale/config.guess | 51
mkfontscale/config.h.in | 36
mkfontscale/config.sub | 54
mkfontscale/configure | 4250 ++++++++++++++++++++++----------
mkfontscale/configure.ac | 23
mkfontscale/data.h | 4
mkfontscale/depcomp | 87
mkfontscale/ident.c | 223 +
mkfontscale/ident.h | 2
mkfontscale/install-sh | 5
mkfontscale/missing | 49
mkfontscale/mkfontscale.c | 12
mkfontscale/mkfontscale.man | 2
73 files changed, 18490 insertions(+), 9038 deletions(-)
New commits:
commit 82500d21386f1fa7d882a702881f6468bd1519a4
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Oct 16 23:05:53 2009 +0200
Update debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 43d0ad8..1f94588 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xfonts-utils (1:7.5+1) UNRELEASED; urgency=low
* font-util 1.1.1.
* mkfontdir 1.0.5.
* mkfontscale 1.0.7.
+ * Update debian/copyright.
-- Julien Cristau <jcristau@debian.org> Fri, 16 Oct 2009 20:42:19 +0200
diff --git a/debian/copyright b/debian/copyright
index 7912f6a..f0ddee9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,17 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
Packaged-By: David Nusinow <dnusinow@debian.org> and others.
-Original-Source-Location:
+Maintainer: xorg@lists.freedesktop.org
+Source:
http://xorg.freedesktop.org/releases/individual/font/
http://xorg.freedesktop.org/releases/individual/app/
Files: bdftopcf/bdftopcf.*
Copyright: Copyright 1991, 1993, 1998 The Open Group
-License: MIT
- 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.
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- 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 OPEN GROUP 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.
- .
- Except as contained in this notice, the name of The Open Group shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from The Open Group.
+License: MIT-TOG
Files: */Makefile.am, */configure.ac
Copyright: Copyright 2005 Red Hat, Inc.
-License: MIT
+License:
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
@@ -50,34 +30,15 @@ License: MIT
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Files: font-util/fontutil.m4
+Files: font-util/fontutil.m4.in
Copyright: Copyright 2005 Red Hat, Inc
-License: MIT
- 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.
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- 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 OPEN GROUP 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.
- .
- Except as contained in this notice, the name of the copyright holders shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from the copyright holders.
+License: MIT-A
+Copyright: Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+License: MIT-B
Files: font-util/map-*
Copyright: Copyright (c) 1991-2003 Unicode, Inc. All Rights reserved.
-License: other
+License:
This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
No claims are made as to fitness for any particular purpose. No
warranties of any kind are expressed or implied. The recipient
@@ -97,7 +58,7 @@ Copyright: Copyright (c) 2003 The NetBSD Foundation, Inc.
All rights reserved.
This code is derived from software contributed to The NetBSD Foundation
by Ben Collver <collver1@attbi.com>.
-License: BSD-2
+License: NetBSD
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -124,7 +85,7 @@ Copyright:
Copyright (c) 2006 Martin Husemann.
Copyright (c) 2007 Joerg Sonnenberger.
All rights reserved.
-License: BSD-2
+License:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -148,7 +109,7 @@ License: BSD-2
Files: fonttosfnt/*.c, fonttosfnt/*.h
Copyright: Copyright (c) 2002-2008 by Juliusz Chroboczek
-License: MIT
+License:
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
@@ -170,7 +131,7 @@ License: MIT
Files: fonttosfnt/env.c
Copyright: Copyright (c) 1987, 1993 The Regents of the University of California.
All rights reserved.
-License: BSD-4
+License: BSD
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -201,7 +162,50 @@ License: BSD-4
Files: mkfontdir/mkfontdir.man
Copyright: Copyright 1993, 1994, 1998 The Open Group
-License: MIT
+License: MIT-TOG
+
+Files: mkfontscale/*.h, mkfontscale/*.c
+Copyright: Copyright (c) 2002-2008 by Juliusz Chroboczek
+License: MIT-C
+
+Files: mkfontscale/ident.c
+Copyright: Copyright (c) 2003 by Juliusz Chroboczek
+License: MIT-C
+Copyright: Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+License: MIT-B
+
+Files: debian/local/update-fonts-alias*
+Copyright:
+ Copyright 1999, 2001, 2002, 2004 Branden Robinson.
+ Copyright 2006 Steve Langasek.
+License: GPL-2
+
+Files: debian/local/update-fonts-dir*
+Copyright: Copyright 1999, 2001, 2002, 2004 Branden Robinson.
+License: GPL-2
+
+Files: debian/local/update-fonts-scale*
+Copyright:
+ Copyright 1999-2002, 2004 Branden Robinson.
+ Copyright 2006 Steve Langasek.
+License: GPL-2
+
+License: GPL-2
+ This is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free
+ Software Foundation, version 2.
+ .
+ This is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+ .
+ You should have received a copy of the GNU General Public License with
+ the Debian operating system, in /usr/share/common-licenses/GPL-2; if
+ not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA 02110-1301 USA.
+
+License: MIT-TOG
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
@@ -224,9 +228,56 @@ License: MIT
other dealings in this Software without prior written authorization
from The Open Group.
-Files: mkfontscale/*.h, mkfontscale/*.c
-Copyright: Copyright (c) 2002-2008 by Juliusz Chroboczek
-License: MIT
+License: MIT-A
+ 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.
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ 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 OPEN GROUP 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.
+ .
+ Except as contained in this notice, the name of the copyright holders shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the copyright holders.
+
+License: MIT-B
+ 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, and/or sell copies of the Software, and to permit persons
+ to whom the Software is furnished to do so, provided that the above
+ copyright notice(s) and this permission notice appear in all copies of
+ the Software and that both the above copyright notice(s) and this
+ permission notice appear in supporting documentation.
+ .
+ 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
+ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ .
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.
+
+License: MIT-C
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
@@ -245,34 +296,3 @@ License: MIT
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-Files: debian/local/update-fonts-alias*
-Copyright:
- Copyright 1999, 2001, 2002, 2004 Branden Robinson.
- Copyright 2006 Steve Langasek.
-License: GPL-2
-
-Files: debian/local/update-fonts-dir*
-Copyright: Copyright 1999, 2001, 2002, 2004 Branden Robinson.
-License: GPL-2
-
-Files: debian/local/update-fonts-scale*
-Copyright:
- Copyright 1999-2002, 2004 Branden Robinson.
- Copyright 2006 Steve Langasek.
-License: GPL-2
-
-License: GPL-2
- This is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free
- Software Foundation, version 2.
- .
- This is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
- .
- You should have received a copy of the GNU General Public License with
- the Debian operating system, in /usr/share/common-licenses/GPL-2; if
- not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- Fifth Floor, Boston, MA 02110-1301 USA.
-
commit 5b9cd3d7053088315f7b98d534a98c6fdf321a08
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Oct 16 22:05:28 2009 +0200
Bump version for 7.5
diff --git a/debian/changelog b/debian/changelog
index 85692f8..43d0ad8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.4+3) UNRELEASED; urgency=low
+xfonts-utils (1:7.5+1) UNRELEASED; urgency=low
* lintian has been fixed, kill the override.
* debian/watch.*, debian/rules: add a target to download the latest upstream
commit f343fb9b4be61d98236d08db8e9bdcebc7569e26
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Oct 16 22:02:54 2009 +0200
mkfontscale 1.0.7.
diff --git a/debian/changelog b/debian/changelog
index cf6cfde..85692f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xfonts-utils (1:7.4+3) UNRELEASED; urgency=low
* bdftopcf 1.0.2.
* font-util 1.1.1.
* mkfontdir 1.0.5.
+ * mkfontscale 1.0.7.
-- Julien Cristau <jcristau@debian.org> Fri, 16 Oct 2009 20:42:19 +0200
diff --git a/mkfontscale/COPYING b/mkfontscale/COPYING
index b706b38..c75e5f2 100644
--- a/mkfontscale/COPYING
+++ b/mkfontscale/COPYING
@@ -17,3 +17,31 @@ 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.
+
+Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
diff --git a/mkfontscale/ChangeLog b/mkfontscale/ChangeLog
index a0001ad..cca5cd0 100644
--- a/mkfontscale/ChangeLog
+++ b/mkfontscale/ChangeLog
@@ -1,3 +1,69 @@
+commit 34a5a7ae5dc6c8d5f8cb50755d16ef0f573ff2f2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat Oct 10 22:31:00 2009 -0700
+
+ mkfontscale 1.0.7
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit acedad9e929c1edfa17fc1cb9d37a19701cd200d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat Oct 10 22:29:08 2009 -0700
+
+ Add link to SubmittingPatches wiki page to README
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 245160adaca3957ead8fc278387c20e11b9bb7d2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat Oct 10 22:26:24 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 2ff1863a387a393e237e9f05525a48806e900368
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Fri Jan 16 20:17:08 2009 -0200
+
+ Silence sparse warnings and update .gitignore.
+
+commit a34031ea9074a453aee217b5845d07333019f26c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Dec 18 16:56:12 2008 -0800
+
+ Version 1.0.6
+
+commit 95c7da3a2717a0352cdd08830fdd1dd1a4024dda
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Dec 18 16:55:56 2008 -0800
+
+ man page typo fix
+
+commit 0d1a2b7970c0eadb834fc2a6c3a68a09691b84ea
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Dec 17 19:29:54 2008 -0800
+
+ Add hooks for checking sources with lint/sparse/etc.
+
+commit 3ae585a3f08cb660c6ce6838557c94f88821b7a5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Dec 17 19:22:27 2008 -0800
+
+ Add basic README with URL's of git, bugzilla & mailing list
+
+commit 03f6a08c503ff12e2457a9ccc13bfbb801e2161d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Dec 17 19:19:03 2008 -0800
+
+ Use XORG_CWARNFLAGS & XORG_CHANGELOG from xorg-macros 1.2
+
+commit 0ca983a6bac03489fb0d2ad158114a811eb276a2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Nov 5 10:07:33 2008 -0800
+
+ Add support for bzip2 compressed fonts if configured --with-bzip2
+
commit 8126d2b694f48cc8137be05705a125f7d02e7e12
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 11 00:03:44 2008 +0200
diff --git a/mkfontscale/Makefile.am b/mkfontscale/Makefile.am
index 213031d..57abbf6 100644
--- a/mkfontscale/Makefile.am
+++ b/mkfontscale/Makefile.am
@@ -21,7 +21,8 @@
bin_PROGRAMS = mkfontscale
-mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
+AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
+AM_CFLAGS = $(CWARNFLAGS)
mkfontscale_LDADD = @MKFONTSCALE_LIBS@
mkfontscale_SOURCES = \
@@ -65,14 +66,19 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
-
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+ $(AM_V_GEN)$(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)
+ $(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
diff --git a/mkfontscale/Makefile.in b/mkfontscale/Makefile.in
index 8d3fc79..66c1e4d 100644
--- a/mkfontscale/Makefile.in
+++ b/mkfontscale/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -38,8 +39,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -69,23 +71,33 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_mkfontscale_OBJECTS = mkfontscale-hash.$(OBJEXT) \
- mkfontscale-ident.$(OBJEXT) mkfontscale-list.$(OBJEXT) \
- mkfontscale-mkfontscale.$(OBJEXT)
+am_mkfontscale_OBJECTS = hash.$(OBJEXT) ident.$(OBJEXT) list.$(OBJEXT) \
+ mkfontscale.$(OBJEXT)
mkfontscale_OBJECTS = $(am_mkfontscale_OBJECTS)
mkfontscale_DEPENDENCIES =
-mkfontscale_LINK = $(CCLD) $(mkfontscale_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(mkfontscale_SOURCES)
DIST_SOURCES = $(mkfontscale_SOURCES)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -93,8 +105,22 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-appmanDATA_INSTALL = $(INSTALL_DATA)
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
DATA = $(appman_DATA)
ETAGS = etags
CTAGS = ctags
@@ -102,17 +128,17 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AUTOCONF = @AUTOCONF@
@@ -122,7 +148,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -131,9 +160,11 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+EGREP = @EGREP@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -144,6 +175,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINT_FLAGS = @LINT_FLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -186,6 +219,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -214,9 +248,11 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
+AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
+AM_CFLAGS = $(CWARNFLAGS)
mkfontscale_LDADD = @MKFONTSCALE_LIBS@
mkfontscale_SOURCES = \
data.h \
@@ -231,7 +267,7 @@ mkfontscale_SOURCES = \
appman_PRE = mkfontscale.man
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog
+EXTRA_DIST = $(appman_PRE)
CLEANFILES = $(appman_DATA)
SED = sed
@@ -252,7 +288,9 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
-MAINTAINERCLEANFILES = ChangeLog
+@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)
+
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -264,15 +302,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -288,9 +326,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
+ $(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
config.h: stamp-h1
@if test ! -f $@; then \
@@ -302,7 +341,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
@@ -311,29 +350,43 @@ distclean-hdr:
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
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 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
mkfontscale$(EXEEXT): $(mkfontscale_OBJECTS) $(mkfontscale_DEPENDENCIES)
@rm -f mkfontscale$(EXEEXT)
- $(mkfontscale_LINK) $(mkfontscale_OBJECTS) $(mkfontscale_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(mkfontscale_OBJECTS) $(mkfontscale_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -341,111 +394,60 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfontscale-hash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfontscale-ident.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfontscale-list.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfontscale-mkfontscale.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ident.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfontscale.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@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:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@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
-@am__fastdepCC_TRUE@ $(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
-@am__fastdepCC_TRUE@ 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
-@am__fastdepCC_TRUE@ $(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`
-@am__fastdepCC_TRUE@ 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
-@am__fastdepCC_TRUE@ $(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
-@am__fastdepCC_TRUE@ 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
-@am__fastdepCC_TRUE@ $(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`
-@am__fastdepCC_TRUE@ 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
-@am__fastdepCC_TRUE@ $(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
-@am__fastdepCC_TRUE@ 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
-@am__fastdepCC_TRUE@ $(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`
-@am__fastdepCC_TRUE@ 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
-@am__fastdepCC_TRUE@ $(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
-@am__fastdepCC_TRUE@ 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
-@am__fastdepCC_TRUE@ $(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`
-@am__fastdepCC_TRUE@ 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`
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
- @list='$(appman_DATA)'; for p in $$list; do \
+ @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \
- $(appmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appmandir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \
done
uninstall-appmanDATA:
@$(NORMAL_UNINSTALL)
- @list='$(appman_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
- rm -f "$(DESTDIR)$(appmandir)/$$f"; \
- done
+ @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(appmandir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(appmandir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(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; nonemtpy = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -453,36 +455,41 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
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 | \
Reply to: