xfonts-utils: Changes to 'debian-unstable'
bdftopcf/ChangeLog | 96
bdftopcf/Makefile.am | 15
bdftopcf/Makefile.in | 354 +-
bdftopcf/aclocal.m4 | 1149 +++++--
bdftopcf/bdftopcf.c | 276 -
bdftopcf/bdftopcf.man | 112
bdftopcf/config.guess | 233 -
bdftopcf/config.sub | 134
bdftopcf/configure | 6063 +++++++++++++++++++++++++++++++++++++++-
bdftopcf/configure.ac | 10
bdftopcf/depcomp | 74
bdftopcf/install-sh | 29
bdftopcf/man/Makefile.am | 12
bdftopcf/man/Makefile.in | 425 ++
bdftopcf/man/bdftopcf.man | 115
debian/changelog | 11
debian/compat | 2
debian/control | 3
debian/rules | 114
debian/xfonts-utils.postinst | 17
debian/xfonts-utils.postinst.in | 22
debian/xfonts-utils.postrm | 17
debian/xfonts-utils.postrm.in | 22
mkfontscale/ChangeLog | 80
mkfontscale/Makefile.in | 439 +-
mkfontscale/aclocal.m4 | 997 ++++--
mkfontscale/compile | 347 ++
mkfontscale/config.guess | 407 +-
mkfontscale/config.h.in | 32
mkfontscale/config.sub | 237 -
mkfontscale/configure | 4194 ++++++++++++++++-----------
mkfontscale/configure.ac | 3
mkfontscale/depcomp | 531 ++-
mkfontscale/hash.c | 31
mkfontscale/ident.c | 5
mkfontscale/install-sh | 35
mkfontscale/man/Makefile.in | 131
mkfontscale/man/mkfontscale.man | 6
mkfontscale/missing | 461 ---
mkfontscale/mkfontscale.c | 33
40 files changed, 13079 insertions(+), 4195 deletions(-)
New commits:
commit 8d3ccfa291c86c1b6f66519b3e7f93cd92d4f575
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 25 17:43:39 2013 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index aa0229d..a2a2b88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
+xfonts-utils (1:7.7+1) unstable; urgency=medium
* bdftopcf 1.0.4
* mkfontscale 1.1.1
@@ -7,7 +7,7 @@ xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
config.{guess,sub} (closes: #717842).
* Disable silent build rules.
- -- Julien Cristau <jcristau@debian.org> Wed, 25 Dec 2013 16:30:20 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 25 Dec 2013 17:43:35 +0100
xfonts-utils (1:7.7~1) unstable; urgency=low
commit 2ad56becd7a9ec1bf8f550457fbba4ed884539f1
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 25 16:57:29 2013 +0100
Disable silent build rules.
diff --git a/debian/changelog b/debian/changelog
index 498e125..aa0229d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
* Bump debhelper compat level to 7.
* Switch to dh with the autotools-dev addon; should give us updated
config.{guess,sub} (closes: #717842).
+ * Disable silent build rules.
-- Julien Cristau <jcristau@debian.org> Wed, 25 Dec 2013 16:30:20 +0100
diff --git a/debian/rules b/debian/rules
index dc9bfc4..39707e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ override_dh_auto_build: $(BUILD_STAMPS)
$(STAMP_DIR)/configure-%:
mkdir -p $(STAMP_DIR)
dh_auto_configure -D$* -B$*-build -- \
+ --disable-silent-rules \
--with-mapdir=\$${prefix}/share/fonts/X11/util
>$@
commit 8c77d11c06e1d18a04f1a921543dd6e1575b6de8
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 25 16:49:10 2013 +0100
Switch to dh with the autotools-dev addon
Should give us updated config.{guess,sub} (closes: #717842).
diff --git a/debian/changelog b/debian/changelog
index be1ba3d..498e125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
* bdftopcf 1.0.4
* mkfontscale 1.1.1
* Bump debhelper compat level to 7.
+ * Switch to dh with the autotools-dev addon; should give us updated
+ config.{guess,sub} (closes: #717842).
-- Julien Cristau <jcristau@debian.org> Wed, 25 Dec 2013 16:30:20 +0100
diff --git a/debian/control b/debian/control
index 51602fc..9c1b5fc 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
debhelper (>= 7),
pkg-config,
quilt,
+ autotools-dev,
libxfont-dev (>= 1:1.0.0),
libx11-dev (>= 2:1.0.0),
x11proto-core-dev,
diff --git a/debian/rules b/debian/rules
index 55ffffd..dc9bfc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,101 +7,52 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# set this to the name of the main shlib's binary package
-PACKAGE = xfonts-utils
-
-include debian/xsfbs/xsfbs.mk
-
# This package contains multiple modules as shipped by upstream. Each module is # contained in a subdirectory in the root dir of the package. You must list each
# subdirectory explicitly so that the build system knows what to build
SUBDIRS = bdftopcf mkfontdir mkfontscale font-util fonttosfnt
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-
-build: build-stamp
-build-stamp: $(STAMP_DIR)/genscripts $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
+%:
+ dh $@ --with autotools-dev
+
+STAMP_DIR = stampdir
+
+CONFIG_STAMPS = $(addprefix $(STAMP_DIR)/configure-, $(SUBDIRS))
+BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
+
+override_dh_auto_configure: $(CONFIG_STAMPS)
+
+override_dh_auto_build: $(BUILD_STAMPS)
+
+$(STAMP_DIR)/configure-%:
+ mkdir -p $(STAMP_DIR)
+ dh_auto_configure -D$* -B$*-build -- \
+ --with-mapdir=\$${prefix}/share/fonts/X11/util
>$@
-$(STAMP_DIR)/build-%: $(STAMP_DIR)/patch
- dh_testdir
- mkdir -p $*-build
- cd $*-build && \
- ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(confflags) \
- --with-mapdir=\$${prefix}/share/fonts/X11/util \
- CFLAGS="$(CFLAGS)" CPPFLAGS="-D_GNU_SOURCE"
- cd $*-build && \
- $(MAKE)
+$(STAMP_DIR)/build-%:
+ mkdir -p $(STAMP_DIR)
+ dh_auto_build -D$* -B$*-build
>$@
-clean: xsfclean
- dh_testdir
- rm -f build-stamp
- rm -f config.cache config.log config.status
- rm -f */config.cache */config.log */config.status
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf *-build
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+clean-%:
+ dh_auto_clean -D$* -B$*-build
+
+override_dh_auto_clean: $(addprefix clean-, $(SUBDIRS))
+ rm -rf $(STAMP_DIR)
+override_dh_auto_install:
for FILE in $(SUBDIRS); do \
cd "$$FILE"-build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-
- dh_installdocs
- dh_install --sourcedir=debian/tmp --fail-missing
- dh_installchangelogs
- dh_lintian
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-get-tarballs: $(patsubst %,get-tarball-%,$(SUBDIRS))
+override_dh_install:
+ dh_install --fail-missing
+
+override_dh_installxfonts:
+ # we don't actually install any fonts
+
+get-tarballs: $(addprefix get-tarball-%,$(SUBDIRS))
get-tarball-%:
uscan --no-conf --download --no-symlink --destdir . --package $* --upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < $*/configure ) --watchfile debian/watch.$* || test $$? = 1
diff --git a/debian/xfonts-utils.postinst b/debian/xfonts-utils.postinst
new file mode 100644
index 0000000..e8b9e0a
--- /dev/null
+++ b/debian/xfonts-utils.postinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+EXCLUDE_DIR=/var/lib/xfonts
+EXCLUDE=$EXCLUDE_DIR/excluded-aliases
+
+if [ "$1" = "configure" ]; then
+ if ! [ -f $EXCLUDE ]; then
+ [ -d $EXCLUDE_DIR ] || mkdir -m 755 -p $EXCLUDE_DIR
+ echo '!! Excluded alias files to be ignored by update-fonts-alias(8)' > $EXCLUDE
+ fi
+fi
+
+#DEBHELPER#
+
+# vim:set ai et sw=4 ts=4 tw=80:
diff --git a/debian/xfonts-utils.postinst.in b/debian/xfonts-utils.postinst.in
deleted file mode 100644
index d4695c8..0000000
--- a/debian/xfonts-utils.postinst.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=xfonts-utils
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-EXCLUDE_DIR=/var/lib/xfonts
-EXCLUDE=$EXCLUDE_DIR/excluded-aliases
-
-if [ "$1" = "configure" ]; then
- if ! [ -f $EXCLUDE ]; then
- [ -d $EXCLUDE_DIR ] || mkdir -m 755 -p $EXCLUDE_DIR
- echo '!! Excluded alias files to be ignored by update-fonts-alias(8)' > $EXCLUDE
- fi
-fi
-
-#DEBHELPER#
-
-# vim:set ai et sw=4 ts=4 tw=80:
diff --git a/debian/xfonts-utils.postrm b/debian/xfonts-utils.postrm
new file mode 100644
index 0000000..3ef7ff0
--- /dev/null
+++ b/debian/xfonts-utils.postrm
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+EXCLUDE_DIR=/var/lib/xfonts
+EXCLUDE=$EXCLUDE_DIR/excluded-aliases
+
+if [ "$1" = purge ]; then
+ if [ -d $EXCLUDE_DIR ]; then
+ rm -f $EXCLUDE
+ rmdir --ignore-fail-on-non-empty $EXCLUDE_DIR
+ fi
+fi
+
+#DEBHELPER#
+
+# vim:set ai et sw=4 ts=4 tw=80:
diff --git a/debian/xfonts-utils.postrm.in b/debian/xfonts-utils.postrm.in
deleted file mode 100644
index 756f938..0000000
--- a/debian/xfonts-utils.postrm.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=xfonts-utils
-THIS_SCRIPT=postrm
-
-#INCLUDE_SHELL_LIB#
-
-EXCLUDE_DIR=/var/lib/xfonts
-EXCLUDE=$EXCLUDE_DIR/excluded-aliases
-
-if [ "$1" = purge ]; then
- if [ -d $EXCLUDE_DIR ]; then
- rm -f $EXCLUDE
- rmdir --ignore-fail-on-non-empty $EXCLUDE_DIR
- fi
-fi
-
-#DEBHELPER#
-
-# vim:set ai et sw=4 ts=4 tw=80:
commit 9e99b26ad03299735c88f76f53522f9e220f1cd1
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 25 16:33:45 2013 +0100
Bump debhelper compat level to 7.
diff --git a/debian/changelog b/debian/changelog
index 9f765bd..be1ba3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
* bdftopcf 1.0.4
* mkfontscale 1.1.1
+ * Bump debhelper compat level to 7.
-- Julien Cristau <jcristau@debian.org> Wed, 25 Dec 2013 16:30:20 +0100
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 36e3734..51602fc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 6.0.7~),
+ debhelper (>= 7),
pkg-config,
quilt,
libxfont-dev (>= 1:1.0.0),
commit 1cdc7f659614232fa73840073c7f4b4bd7d14560
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 25 16:32:17 2013 +0100
mkfontscale 1.1.1
diff --git a/debian/changelog b/debian/changelog
index 3a6b590..9f765bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
* bdftopcf 1.0.4
+ * mkfontscale 1.1.1
-- Julien Cristau <jcristau@debian.org> Wed, 25 Dec 2013 16:30:20 +0100
diff --git a/mkfontscale/ChangeLog b/mkfontscale/ChangeLog
index 9f64a23..d93e5ed 100644
--- a/mkfontscale/ChangeLog
+++ b/mkfontscale/ChangeLog
@@ -1,3 +1,83 @@
+commit f48de13423c7300f4da9f61993b624426b38ddc0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jul 16 22:50:54 2013 -0700
+
+ mkfontscale 1.1.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f731c5c36f28ddd0f25f474d2991c96f9a7a915c
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Sun Jun 2 21:16:54 2013 +0200
+
+ Protect config.h inclusion like usual.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 19e2cb7c6a3ec2c5b1bc0d24866fa685eef0ee13
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue May 21 15:50:19 2013 +1000
+
+ Document -u/-U options in man page
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b3af8de8d25128f565c2ed2f7c63b6e4099eb84e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jan 19 12:05:06 2013 -0800
+
+ Replace malloc(strlen);strcpy() calls with strdup
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 547517571e695728278a264eedbac47b6e1f43bc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jan 19 11:51:39 2013 -0800
+
+ Since hash() returns unsigned int, store results in unsigned ints
+
+ Clears clang warnings:
+ hash.c:82:13: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
+ int i = hash(key);
+ ~ ^~~~~~~~~
+ hash.c:94:13: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
+ int i = hash(key);
+ ~ ^~~~~~~~~
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1157b3039551b552b483f05f6a411e57941a87c0
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Fri Jan 11 12:04:16 2013 -0500
+
+ Fix compilation for MinGW
+
+ Fix compilation for MinGW since 9cbe3256bc932b82f2435b23cda0931f4f5f5ba2
+ Unfortunately, MinGW doesn't define S_ISLNK, so check for that as well.
+
+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
+ Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
+
+commit 9cbe3256bc932b82f2435b23cda0931f4f5f5ba2
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Thu May 19 10:38:44 2011 +0200
+
+ Prefer original file over symlink (v2)
+
+ If a symlink to a fontfile in the same directory exists the file
+ that got picked depends on the order in which readdir() picked
+ entries.
+ This patch gives the file a higher preference than the symlink to
+ it so it will be preferred if the xlfd entries match.
+
+ v2: Followed a suggestion by Julien Cristau <jcristau@debian.org>
+ to check for DT_LNK being defined instead of _BSD_SOURCE
+ and fall back to lstat() if d_type is DT_UNKNOWN.
+
+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
+
commit 4c3f72f9e3385d9c855416b6498ced067a97c712
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Feb 10 20:19:37 2012 -0800
diff --git a/mkfontscale/Makefile.in b/mkfontscale/Makefile.in
index 536dff1..ac61a9a 100644
--- a/mkfontscale/Makefile.in
+++ b/mkfontscale/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 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.
@@ -37,6 +36,51 @@
# PERFORMANCE OF THIS SOFTWARE.
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -57,10 +101,10 @@ 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 COPYING ChangeLog INSTALL config.guess \
- config.sub depcomp install-sh missing
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in depcomp COPYING ChangeLog INSTALL README \
+ compile config.guess config.sub 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) \
@@ -77,50 +121,89 @@ am_mkfontscale_OBJECTS = hash.$(OBJEXT) ident.$(OBJEXT) list.$(OBJEXT) \
mkfontscale.$(OBJEXT)
mkfontscale_OBJECTS = $(am_mkfontscale_OBJECTS)
mkfontscale_DEPENDENCIES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
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 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
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 " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(mkfontscale_SOURCES)
DIST_SOURCES = $(mkfontscale_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
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)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -148,7 +231,10 @@ am__relativize = \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
+DIST_TARGETS = dist-bzip2 dist-gzip
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -296,7 +382,7 @@ all: config.h
.SUFFIXES:
.SUFFIXES: .c .o .obj
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -332,10 +418,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -349,14 +433,18 @@ distclean-hdr:
-rm -f config.h stamp-h1
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
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; \
+ 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|.*|.|' \
+ 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 } \
@@ -377,14 +465,16 @@ uninstall-binPROGRAMS:
@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)/' `; \
+ -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)
+
+mkfontscale$(EXEEXT): $(mkfontscale_OBJECTS) $(mkfontscale_DEPENDENCIES) $(EXTRA_mkfontscale_DEPENDENCIES)
@rm -f mkfontscale$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(mkfontscale_OBJECTS) $(mkfontscale_LDADD) $(LIBS)
@@ -402,36 +492,37 @@ distclean-compile:
.c.o:
@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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
@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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -446,57 +537,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -512,12 +558,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -529,15 +570,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -546,9 +583,31 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -584,13 +643,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -622,36 +678,41 @@ distdir: $(DISTFILES)
Reply to: