COPYING | 54 ChangeLog | 448 Makefile.am | 7 Makefile.in | 799 - README | 25 aclocal.m4 | 7548 ------------- config.guess | 1500 -- config.h.in | 118 config.sub | 1608 -- configure |22403 --------------------------------------- configure.ac | 59 debian/changelog | 81 debian/control | 43 debian/copyright | 3 debian/libxfont1.shlibs | 1 debian/rules | 25 debian/xsfbs/xsfbs-autoreconf.mk | 150 debian/xsfbs/xsfbs.mk | 168 debian/xsfbs/xsfbs.sh | 396 depcomp | 530 include/X11/fonts/bitmap.h | 7 include/X11/fonts/bufio.h | 5 include/X11/fonts/fntfil.h | 4 include/X11/fonts/fontconf.h.in | 2 include/X11/fonts/pcf.h | 2 install-sh | 323 ltmain.sh | 6871 ----------- missing | 360 mkinstalldirs | 158 src/FreeType/Makefile.am | 4 src/FreeType/Makefile.in | 475 src/FreeType/ft.h | 1 src/FreeType/ftenc.c | 4 src/FreeType/ftfuncs.c | 1 src/FreeType/ftsystem.c | 331 src/FreeType/fttools.c | 54 src/FreeType/xttcap.c | 400 src/FreeType/xttcap.h | 5 src/Makefile.am | 13 src/Makefile.in | 673 - src/Speedo/Makefile.am | 2 src/Speedo/Makefile.in | 509 src/Speedo/do_char.c | 207 src/Speedo/do_trns.c | 14 src/Speedo/out_scrn.c | 172 src/Speedo/out_util.c | 196 src/Speedo/reset.c | 2 src/Speedo/set_spcs.c | 10 src/Speedo/set_trns.c | 234 src/Speedo/spdo_prv.h | 161 src/Speedo/speedo.h | 16 src/Speedo/spglyph.c | 2 src/Speedo/spint.h | 2 src/Type1/Makefile.am | 3 src/Type1/Makefile.in | 530 src/Type1/arith.c | 276 src/Type1/arith.h | 6 src/Type1/digit.h | 2 src/Type1/fontfcn.c | 11 src/Type1/fontfcn.h | 2 src/Type1/lines.c | 69 src/Type1/lines.h | 2 src/Type1/objects.c | 267 src/Type1/objects.h | 39 src/Type1/paths.c | 662 - src/Type1/paths.h | 34 src/Type1/regions.c | 423 src/Type1/regions.h | 26 src/Type1/scanfont.c | 2 src/Type1/spaces.c | 221 src/Type1/spaces.h | 21 src/Type1/t1funcs.c | 50 src/Type1/t1info.c | 5 src/Type1/t1intf.h | 1 src/Type1/t1malloc.c | 4 src/Type1/t1stub.c | 56 src/Type1/util.h | 1 src/bitmap/Makefile.am | 2 src/bitmap/Makefile.in | 485 src/bitmap/bdfread.c | 11 src/bitmap/bitmapfunc.c | 137 src/bitmap/bitscale.c | 27 src/bitmap/pcfread.c | 6 src/bitmap/snfread.c | 2 src/bitmap/snfstr.h | 1 src/builtins/Makefile.am | 2 src/builtins/Makefile.in | 475 src/builtins/builtin.h | 8 src/builtins/dir.c | 159 src/builtins/file.c | 22 src/builtins/fonts.c | 14 src/builtins/fpe.c | 23 src/builtins/render.c | 35 src/fc/Makefile.am | 2 src/fc/Makefile.in | 474 src/fc/fsconvert.c | 40 src/fc/fserve.c | 85 src/fc/fserve.h | 3 src/fc/fservestr.h | 9 src/fc/fsio.c | 64 src/fc/fsio.h | 7 src/fc/fstrans.c | 2 src/fontcache/.gitignore | 6 src/fontcache/Makefile.am | 8 src/fontcache/Makefile.in | 466 src/fontcache/fcqueue.h | 133 src/fontcache/fontcache.c | 1022 - src/fontcache/fontcache.h | 121 src/fontfile/Makefile.am | 9 src/fontfile/Makefile.in | 504 src/fontfile/bufio.c | 22 src/fontfile/bunzip2.c | 179 src/fontfile/catalogue.c | 478 src/fontfile/dirfile.c | 6 src/fontfile/ffcheck.c | 60 src/fontfile/fileio.c | 9 src/fontfile/fontdir.c | 14 src/fontfile/fontfile.c | 41 src/fontfile/register.c | 61 src/stubs/Makefile.am | 3 src/stubs/Makefile.in | 500 src/stubs/cauthgen.c | 4 src/stubs/csignal.c | 4 src/stubs/delfntcid.c | 4 src/stubs/errorf.c | 4 src/stubs/fatalerror.c | 4 src/stubs/findoldfnt.c | 4 src/stubs/fontmod.c | 14 src/stubs/getcres.c | 4 src/stubs/getdefptsize.c | 4 src/stubs/getnewfntcid.c | 4 src/stubs/gettime.c | 4 src/stubs/initfshdl.c | 4 src/stubs/regfpefunc.c | 4 src/stubs/rmfshdl.c | 4 src/stubs/servclient.c | 4 src/stubs/setfntauth.c | 4 src/stubs/stfntcfnt.c | 4 src/stubs/xpstubs.c | 5 src/util/Makefile.am | 2 src/util/Makefile.in | 485 src/util/atom.c | 12 src/util/miscutil.c | 14 143 files changed, 2932 insertions(+), 53300 deletions(-)
New commits: commit a8b5aa10c4c4a129d8a04e13419da59648047082 Author: Julien Cristau <jcris...@debian.org> Date: Tue Dec 23 15:07:19 2008 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 1b15149..570949d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxfont (1:1.3.4-1) UNRELEASED; urgency=low +libxfont (1:1.3.4-1) experimental; urgency=low * Wrap build-deps in debian/control. * Run autoreconf on build; build-dep on xutils-dev, autoconf, automake and @@ -7,7 +7,7 @@ libxfont (1:1.3.4-1) UNRELEASED; urgency=low * New upstream release. * Drop obsolete x11proto-fontcache-dev build-dependency. - -- Julien Cristau <jcris...@debian.org> Tue, 23 Dec 2008 14:42:17 +0100 + -- Julien Cristau <jcris...@debian.org> Tue, 23 Dec 2008 15:06:37 +0100 libxfont (1:1.3.3-1) unstable; urgency=high commit 652132872b86977afa2ec4cd3c1aeaa6f70668bf Author: Julien Cristau <jcris...@debian.org> Date: Tue Dec 23 14:54:59 2008 +0100 Drop obsolete x11proto-fontcache-dev build-dependency. diff --git a/debian/changelog b/debian/changelog index 625feb3..1b15149 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libxfont (1:1.3.4-1) UNRELEASED; urgency=low libtool. * Handle parallel builds. * New upstream release. + * Drop obsolete x11proto-fontcache-dev build-dependency. -- Julien Cristau <jcris...@debian.org> Tue, 23 Dec 2008 14:42:17 +0100 diff --git a/debian/control b/debian/control index 7a9e678..53de06a 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Build-Depends: x11proto-core-dev, xtrans-dev, x11proto-fonts-dev, - x11proto-fontcache-dev, libfreetype6-dev, quilt, xutils-dev (>= 1:7.4+4), commit 672847eac2ba800002b703008423ff7c57d30c0a Author: Julien Cristau <jcris...@debian.org> Date: Tue Dec 23 14:47:47 2008 +0100 New upstream release, update changelogs diff --git a/ChangeLog b/ChangeLog index 31210df..578ba5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,120 @@ +commit 282ac4226195d58e3818e7ac97093e396aa78086 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri Dec 19 15:07:21 2008 -0800 + + Version bump: 1.3.4 + +commit 5c631ad798fcdea4f2b7d0b012ac94182fad4184 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri Dec 19 14:01:28 2008 -0800 + + miscutil.c:108: warning: old-style parameter declaration + +commit d21d6c5b23a23f120f32b483ec6b86cf88cb3a98 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri Dec 19 13:47:48 2008 -0800 + + Add simple README with pointers to bugzilla/git/mailing list + +commit d3be1261d29b7d8eda124add3497a93ebe34712c +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri Dec 19 13:47:27 2008 -0800 + + Update COPYING file with additional copyrights/licenses + +commit b5cc4a10c0fe365b40be19613777f192a1ada0db +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri Dec 19 13:05:32 2008 -0800 + + Use XORG_CWARNFLAGS & XORG_CHANGELOG macros from xorg-macros 1.2 + +commit 377584bb71ccb2cc380c3a8f71f0acd7e755ad33 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Thu Dec 18 21:22:31 2008 -0800 + + Always scan catalogue dirs at startup, even if their mtime < 0 + + Works around bug in VMWare that caused the Solaris kernel to fail to read + the time-of-day chip on boot, and start with a time < 0 (i.e. back to the + 1960's) - when the system was then installed from this mode, Xorg wouldn't + start after reboot, since the mtime would be < 0 and the catalogue dir was + then skipped as not changed since reading at the 0 initially set in the + cat->mtime. + + Fixes OpenSolaris bug #4780 + <http://defect.opensolaris.org/bz/show_bug.cgi?id=4780> + +commit 9ad7f24fafe876851b89190732034da6fb640788 +Author: Benjamin Close <benjamin.cl...@clearchain.com> +Date: Thu Dec 11 15:26:13 2008 +1030 + + Make sure font names/font alias names are null terminated + + This fixes a crash upon server restart where the saved fonts were + being restored however strlen(font_name) was incorrect hence memory + was being clobbered. + +commit d93cc906d4a2f42d11629e245fb13a2d08cf2a61 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Thu Dec 4 16:56:56 2008 -0800 + + Pad CreateAC packets with 0 auths to workaround xfs bug + + Versions of xfs before commit 3fe28a31a2974287acc182c7c9bfd68d94ea6292 + will reject CreateAC packets with 0 auths unless they claim to have at + least 4 bytes of authentication data that isn't actually read. + +commit f859a76b0f325b07952ad1c5c818318307c589b0 +Author: Julien Cristau <jcris...@debian.org> +Date: Tue Nov 4 19:24:29 2008 +0100 + + Don't clobber CFLAGS in configure + + This lets the user set CFLAGS when running make. + +commit 6bf52de1fb84d61b227daf7a7077af9ea3ec27a3 +Author: Peter Breitenlohner <p...@mppmu.mpg.de> +Date: Mon Oct 20 19:32:23 2008 -0700 + + X.Org Bug 17945: avoid gcc warnings for libXfont + + <http://bugs.freedesktop.org/show_bug.cgi?id=17945> + + Avoid two gcc warnings + src/fontfile/ffcheck.c:150: warning: initialization discards qualifiers from pointer target type + src/fontfile/register.c:98: warning: initialization discards qualifiers from pointer target type + +commit b012dcf65b1f0e41def2f595f1b1e7b06a49d275 +Author: Adam Jackson <a...@redhat.com> +Date: Thu Aug 28 15:36:06 2008 -0400 + + Retry font server connections faster. + +commit 8a6df69750a2d350074715fb31d9d20195d00b4c +Author: Adam Jackson <a...@redhat.com> +Date: Thu Aug 28 15:35:16 2008 -0400 + + Nuke fontcache. + + Hasn't been relevant since the X-TT merge ages ago. + +commit 5d5587a36453d731e9a7353a98fa391dbb51b57d +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Thu Aug 21 19:58:06 2008 -0700 + + Add support for bzip2 bitmap font compression + + Code originally written for Solaris Xsun in 2003, ported now to current Xorg + <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4819077> + +commit 624b7a507cdea25cec0728b4679610df3fb3097c +Author: Derek Wang <derek.w...@sun.com> +Date: Thu Aug 21 16:06:51 2008 -0700 + + Sun bug 4510977: dtremote fails to start session + + <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4510977> + commit 684c000e57f30344777cf763f2f1b540ef008b38 Author: Adam Jackson <a...@redhat.com> Date: Wed Jul 2 15:30:03 2008 -0400 diff --git a/debian/changelog b/debian/changelog index 82f7773..625feb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -libxfont (1:1.3.3-2) UNRELEASED; urgency=low +libxfont (1:1.3.4-1) UNRELEASED; urgency=low * Wrap build-deps in debian/control. * Run autoreconf on build; build-dep on xutils-dev, autoconf, automake and libtool. * Handle parallel builds. + * New upstream release. -- Julien Cristau <jcris...@debian.org> Tue, 23 Dec 2008 14:42:17 +0100 commit e47614e1c2f667170477b19e45c37aa29792a38a Author: Julien Cristau <jcris...@debian.org> Date: Tue Dec 23 14:47:10 2008 +0100 delete generated files diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 993b498..0000000 --- a/Makefile.in +++ /dev/null @@ -1,794 +0,0 @@ -# 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, 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -...@set_make@ - -# -# Copyright © 2003 Keith Packard, Noah Levitt -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in -# advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no -# representations about the suitability of this software for any purpose. It -# is provided "as is" without express or implied warranty. -# -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = . -DIST_COMMON = $(am__configure_deps) $(libXfontinclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(srcdir)/xfont.pc.in \ - $(top_srcdir)/configure \ - $(top_srcdir)/include/X11/fonts/fontconf.h.in AUTHORS COPYING \ - ChangeLog config.guess config.sub depcomp install-sh ltmain.sh \ - missing mkinstalldirs -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 config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h $(top_builddir)/include/X11/fonts/fontconf.h -CONFIG_CLEAN_FILES = xfont.pc -SOURCES = -DIST_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 -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(libXfontincludedir)" \ - "$(DESTDIR)$(libXfontincludedir)" -pkgconfigDATA_INSTALL = $(INSTALL_DATA) -DATA = $(pkgconfig_DATA) -libXfontincludeHEADERS_INSTALL = $(INSTALL_HEADER) -nodist_libXfontincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libXfontinclude_HEADERS) $(nodist_libXfontinclude_HEADERS) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -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); }; } -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@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCODINGSDIR = @ENCODINGSDIR@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FONTCACHEPROTO_CFLAGS = @FONTCACHEPROTO_CFLAGS@ -FONTCACHEPROTO_LIBS = @FONTCACHEPROTO_LIBS@ -FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ -FREETYPE_LIBS = @FREETYPE_LIBS@ -FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MATH_LIBS = @MATH_LIBS@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XFONT_CFLAGS = @XFONT_CFLAGS@ -XFONT_LIBS = @XFONT_LIBS@ -X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@ -Z_LIBS = @Z_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@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -ft_config = @ft_config@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -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@ -SUBDIRS = src -libXfontincludedir = $(includedir)/X11/fonts -libXfontinclude_HEADERS = \ - include/X11/fonts/bdfint.h \ - include/X11/fonts/bitmap.h \ - include/X11/fonts/bufio.h \ - include/X11/fonts/fntfil.h \ - include/X11/fonts/fntfilio.h \ - include/X11/fonts/fntfilst.h \ - include/X11/fonts/fontencc.h \ - include/X11/fonts/fontmisc.h \ - include/X11/fonts/fontmod.h \ - include/X11/fonts/fontshow.h \ - include/X11/fonts/fontutil.h \ - include/X11/fonts/fontxlfd.h \ - include/X11/fonts/pcf.h \ - src/FreeType/ft.h \ - src/FreeType/ftfuncs.h - -nodist_libXfontinclude_HEADERS = \ - include/X11/fonts/fontconf.h - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xfont.pc -EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in ChangeLog -CLEANFILES = ChangeLog -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi - -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: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 - touch $@ - -include/X11/fonts/fontconf.h: include/X11/fonts/stamp-h2 - @if test ! -f $@; then \ - rm -f include/X11/fonts/stamp-h2; \ - $(MAKE) $(AM_MAKEFLAGS) include/X11/fonts/stamp-h2; \ - else :; fi - -include/X11/fonts/stamp-h2: $(top_srcdir)/include/X11/fonts/fontconf.h.in $(top_builddir)/config.status - @rm -f include/X11/fonts/stamp-h2 - cd $(top_builddir) && $(SHELL) ./config.status include/X11/fonts/fontconf.h - -distclean-hdr: - -rm -f config.h stamp-h1 include/X11/fonts/fontconf.h include/X11/fonts/stamp-h2 -xfont.pc: $(top_builddir)/config.status $(srcdir)/xfont.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done -install-libXfontincludeHEADERS: $(libXfontinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libXfontincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libXfontincludedir)" - @list='$(libXfontinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libXfontincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libXfontincludedir)/$$f'"; \ - $(libXfontincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libXfontincludedir)/$$f"; \ - done - -uninstall-libXfontincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libXfontinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libXfontincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libXfontincludedir)/$$f"; \ - done -install-nodist_libXfontincludeHEADERS: $(nodist_libXfontinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libXfontincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libXfontincludedir)" - @list='$(nodist_libXfontinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(nodist_libXfontincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libXfontincludedir)/$$f'"; \ - $(nodist_libXfontincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libXfontincludedir)/$$f"; \ - done - -uninstall-nodist_libXfontincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(nodist_libXfontinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libXfontincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libXfontincludedir)/$$f"; \ - done - -# 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): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @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; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -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; } \ - 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=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$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; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(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 | \ - $(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 - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - 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; \ - 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; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || 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 $(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 - $(am__remove_distdir) -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) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - 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*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org