xfs: Changes to 'debian-unstable'
.gitignore | 21
ChangeLog | 12
Makefile.am | 1
Makefile.in | 912 ++-----
aclocal.m4 | 2283 ++++++++++--------
autogen.sh | 13
config.guess | 667 +++--
config.sub | 222 +
configure | 4720 ++++++++++++++++++++-------------------
configure.ac | 4
debian/changelog | 18
debian/control | 2
debian/patches/01_xfs_fixes.diff | 42
debian/rules | 5
debian/xfs.init | 10
debian/xfs.install | 2
debian/xsfbs/xsfbs-autoreconf.mk | 150 +
debian/xsfbs/xsfbs.mk | 379 +++
debian/xsfbs/xsfbs.sh | 907 +++++++
depcomp | 103
difs/cache.c | 3
install-sh | 477 ++-
missing | 142 -
mkinstalldirs | 89
os/xfstrans.c | 2
xfs.man | 2
26 files changed, 6674 insertions(+), 4514 deletions(-)
New commits:
commit 560aaff9b045db928f5f0aee6fd632f1f6740f43
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 16 13:50:45 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index e33e9a7..8779b7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfs (1:1.0.4-1) UNRELEASED; urgency=low
+xfs (1:1.0.4-1) unstable; urgency=low
[ Julien Cristau ]
* New upstream release.
@@ -14,7 +14,7 @@ xfs (1:1.0.4-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Drop useless -DLIBXCURSOR from debian/rules.
- -- Julien Cristau <jcristau@debian.org> Wed, 16 May 2007 13:45:10 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 16 May 2007 13:50:33 +0200
xfs (1:1.0.1-5) unstable; urgency=low
commit 9b2447b7425d880dddd64d10c267130c2e96c324
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 16 13:46:51 2007 +0200
Add LSB dependency info in xfs.init (closes: #335389).
diff --git a/debian/changelog b/debian/changelog
index 08b6506..e33e9a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,13 @@ xfs (1:1.0.4-1) UNRELEASED; urgency=low
(closes: #424113).
* Fix substitutions in xfs(1). (closes: #406829).
* Bump Standards-Version to 3.7.2 (no changes).
+ * Add LSB dependency info in xfs.init (closes: #335389). Thanks, Petter
+ Reinholdtsen!
[ Brice Goglin ]
* Drop useless -DLIBXCURSOR from debian/rules.
- -- Julien Cristau <jcristau@debian.org> Wed, 16 May 2007 13:43:05 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 16 May 2007 13:45:10 +0200
xfs (1:1.0.1-5) unstable; urgency=low
diff --git a/debian/xfs.init b/debian/xfs.init
index b9f10a7..2ac00a7 100644
--- a/debian/xfs.init
+++ b/debian/xfs.init
@@ -19,6 +19,16 @@
# not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
+### BEGIN INIT INFO
+# Provides: xfs
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Should-Start: $network
+# Should-Stop: $network
+# Default-Start: 2 3 4 5
+# Default-Stop: S 0 1 6
+### END INIT INFO
+
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
commit 982522cd659225d012f06bf548d7bb90403a2769
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 16 13:45:07 2007 +0200
Add closer for #424113, bump Standards-Version to 3.7.2.
diff --git a/debian/changelog b/debian/changelog
index 52b0442..08b6506 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,13 +4,15 @@ xfs (1:1.0.4-1) UNRELEASED; urgency=low
* New upstream release.
+ Update patch 01_xfs_fixes.diff.
+ Install the manpage as xfs.1, not xfs.1x.
- * Don't put debug symbols in a nonexistent xfs-dbg package.
+ * Don't put debug symbols in a nonexistent xfs-dbg package
+ (closes: #424113).
* Fix substitutions in xfs(1). (closes: #406829).
+ * Bump Standards-Version to 3.7.2 (no changes).
[ Brice Goglin ]
* Drop useless -DLIBXCURSOR from debian/rules.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Thu, 8 Mar 2007 20:45:29 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 16 May 2007 13:43:05 +0200
xfs (1:1.0.1-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 4f5cb5a..fba6017 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
Build-Depends: debhelper (>= 4.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libxfont-dev (>= 1:1.0.0-1), xtrans-dev (>= 1.0.0-1), quilt
-Standards-Version: 3.6.1.0
+Standards-Version: 3.7.2
Package: xfs
Architecture: any
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 6afc62e3a3c719893a61aa73641ddb34b54512a5
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Mar 8 21:26:20 2007 +0100
Add closer.
diff --git a/debian/changelog b/debian/changelog
index e02e9d3..52b0442 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xfs (1:1.0.4-1) UNRELEASED; urgency=low
+ Update patch 01_xfs_fixes.diff.
+ Install the manpage as xfs.1, not xfs.1x.
* Don't put debug symbols in a nonexistent xfs-dbg package.
+ * Fix substitutions in xfs(1). (closes: #406829).
[ Brice Goglin ]
* Drop useless -DLIBXCURSOR from debian/rules.
commit f1433e7b9efde6af41bbf7755c383b0a48b5b96d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Mar 8 20:46:01 2007 +0100
* Drop useless -DLIBXCURSOR from debian/rules.
diff --git a/debian/changelog b/debian/changelog
index 7c7a072..e02e9d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
xfs (1:1.0.4-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* New upstream release.
+ Update patch 01_xfs_fixes.diff.
+ Install the manpage as xfs.1, not xfs.1x.
* Don't put debug symbols in a nonexistent xfs-dbg package.
- -- Julien Cristau <jcristau@debian.org> Sat, 3 Mar 2007 00:59:13 +0100
+ [ Brice Goglin ]
+ * Drop useless -DLIBXCURSOR from debian/rules.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Thu, 8 Mar 2007 20:45:29 +0100
xfs (1:1.0.1-5) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 3152149..c709390 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,9 +33,6 @@ endif
confflags += --enable-man-pages=3
-# so very wrong
-CFLAGS += -DLIBXCURSOR=\\\"libXcursor.so.1\\\"
-
build: patch build-stamp
build-stamp:
dh_testdir
commit 32761e012b2a32ff8888888a6a437eba6b9f1736
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 3 01:17:22 2007 +0100
Fix substitutions in xfs(1).
diff --git a/debian/patches/01_xfs_fixes.diff b/debian/patches/01_xfs_fixes.diff
index 89abfe3..a8ffb1f 100644
--- a/debian/patches/01_xfs_fixes.diff
+++ b/debian/patches/01_xfs_fixes.diff
@@ -27,8 +27,8 @@ Not submitted upstream yet.
Index: os/utils.c
===================================================================
---- os/utils.c (revision 309)
-+++ os/utils.c (working copy)
+--- os/utils.c.orig 2007-03-03 01:02:00.000000000 +0100
++++ os/utils.c 2007-03-03 01:07:29.000000000 +0100
@@ -3,7 +3,7 @@
* misc os utilities
*/
@@ -278,14 +278,14 @@ Index: os/utils.c
+}
Index: xfs.man
===================================================================
---- xfs.man (revision 309)
-+++ xfs.man (working copy)
+--- xfs.man.orig 2007-03-03 01:02:00.000000000 +0100
++++ xfs.man 2007-03-03 01:12:48.000000000 +0100
@@ -37,206 +37,320 @@
.\" suitability of this software for any purpose. It is provided "as is"
.\" without express or implied warranty.
.\" $Xorg: xfs.man,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $
-.TH XFS 1 __xorgversion__
-+.TH xfs __mansuffix__ __xorgversion__
++.TH xfs __appmansuffix__ __xorgversion__
.SH NAME
xfs \- X font server
.SH SYNOPSIS
@@ -327,7 +327,7 @@ Index: xfs.man
+is the X Window System font server.
+It supplies fonts to X Window System display servers.
+The server is usually run by a system administrator, and started via
-+.BR init (__osadmmansuffix__).
++.BR init (__adminmansuffix__).
+Users may also wish to start private font servers for specific sets of
+fonts.
.PP
@@ -354,7 +354,7 @@ Index: xfs.man
+.B xfs
+will use.
+If this parameter is not specified, the default file,
-+.IR __projectroot__/lib/X11/fs/config ,
++.IR __configdir__/config ,
will be used.
-.TP 8
-.B \-ls listen_socket
@@ -494,7 +494,7 @@ Index: xfs.man
+.SS "Configuration File Format"
+.B xfs
+reads its configuration from
-+.I __projectroot__/lib/X11/fs/config
++.I __configdir__/config
+by default (see the
+.B \-config
+option in the \(lqOPTIONS\(rq section above).
@@ -621,7 +621,7 @@ Index: xfs.man
+.TP
+.BR use\-syslog " (\fIboolean\fP)"
+determines whether errors and diagnostics should be reported via
-+.BR syslog (__oslibmansuffix__)
++.BR syslog (__libmansuffix__)
+(on supported systems) instead of being written to the
+.B error\-file
+(see above).
@@ -666,14 +666,7 @@ Index: xfs.man
XCOMM 100 x 100 and 75 x 75
-default-resolutions = 100,100,75,75
-use-syslog = off
-+default\-resolutions = 100,100,75,75
-+
-+XCOMM Specify our log filename.
-+error\-file = /var/log/xfs.log
-+
-+XCOMM Direct diagnostics to our own log file instead of using syslog.
-+use\-syslog = off
- .fi
+-.fi
-.sp
-.SH "FONT SERVER NAMES"
-One of the following forms can be used to name a font server that
@@ -698,7 +691,14 @@ Index: xfs.man
-.nf
- decnet/\fInodename\fP::font$\fIobjname\fP
- decnet/\fInodename\fP::font$\fIobjname\fP/\fIcataloguelist\fP
--.fi
++default\-resolutions = 100,100,75,75
++
++XCOMM Specify our log filename.
++error\-file = /var/log/xfs.log
++
++XCOMM Direct diagnostics to our own log file instead of using syslog.
++use\-syslog = off
+ .fi
-.PP
-The \fInodename\fP specifies the name (or decimal numeric address)
-of the machine on which the font server is running.
@@ -763,7 +763,7 @@ Index: xfs.man
Keith Packard, Massachusetts Institute of Technology
+.SH "SEE ALSO"
+.BR X (__miscmansuffix__),
-+.BR init (__osadmmansuffix__),
-+.BR syslog (__oslibmansuffix__),
++.BR init (__adminmansuffix__),
++.BR syslog (__libmansuffix__),
+.IR "The X Font Service Protocol" ,
+.I Font Server Implementation Overview
commit 0633e07cb3314f504c2235d915fcc201716f76b1
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 3 01:00:00 2007 +0100
* Don't put debug symbols in a nonexistent xfs-dbg package.
diff --git a/debian/changelog b/debian/changelog
index 5426722..7c7a072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xfs (1:1.0.4-1) UNRELEASED; urgency=low
* New upstream release.
+ Update patch 01_xfs_fixes.diff.
+ Install the manpage as xfs.1, not xfs.1x.
+ * Don't put debug symbols in a nonexistent xfs-dbg package.
- -- Julien Cristau <jcristau@debian.org> Sat, 3 Mar 2007 00:48:38 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 3 Mar 2007 00:59:13 +0100
xfs (1:1.0.1-5) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 1f42805..3152149 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ binary-arch: build install
dh_installexamples
dh_installinit
dh_link
- dh_strip --dbg-package=$(PACKAGE)
+ dh_strip
dh_compress
dh_fixperms
dh_installdeb
commit a857bfe256d284f835421b642fa991b9bda4b78a
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 3 00:49:21 2007 +0100
+ Install the manpage as xfs.1, not xfs.1x.
diff --git a/debian/changelog b/debian/changelog
index 307d7c5..5426722 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xfs (1:1.0.4-1) UNRELEASED; urgency=low
* New upstream release.
+ Update patch 01_xfs_fixes.diff.
+ + Install the manpage as xfs.1, not xfs.1x.
- -- Julien Cristau <jcristau@debian.org> Sat, 3 Mar 2007 00:36:35 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 3 Mar 2007 00:48:38 +0100
xfs (1:1.0.1-5) unstable; urgency=low
diff --git a/debian/xfs.install b/debian/xfs.install
index c4171f6..1f2a5d2 100644
--- a/debian/xfs.install
+++ b/debian/xfs.install
@@ -1,3 +1,3 @@
usr/bin/xfs
-usr/share/man/man1/xfs.1x
+usr/share/man/man1/xfs.1
etc/X11/fs/config
commit 05b00880c70c16ac9284f2cade2739fdf7d24510
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 3 00:43:17 2007 +0100
autoreconf
diff --git a/Makefile.in b/Makefile.in
index 7f0c919..23449b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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.
@@ -35,6 +35,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -42,7 +43,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -56,7 +56,72 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+bin_PROGRAMS = xfs$(EXEEXT)
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ config.guess config.sub depcomp install-sh missing \
+ mkinstalldirs
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
+ "$(DESTDIR)$(configdir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_xfs_OBJECTS = atom.$(OBJEXT) cache.$(OBJEXT) charinfo.$(OBJEXT) \
+ difsutils.$(OBJEXT) dispatch.$(OBJEXT) events.$(OBJEXT) \
+ extensions.$(OBJEXT) fontinfo.$(OBJEXT) fonts.$(OBJEXT) \
+ globals.$(OBJEXT) initfonts.$(OBJEXT) main.$(OBJEXT) \
+ resource.$(OBJEXT) swaprep.$(OBJEXT) swapreq.$(OBJEXT) \
+ tables.$(OBJEXT) access.$(OBJEXT) config.$(OBJEXT) \
+ connection.$(OBJEXT) daemon.$(OBJEXT) error.$(OBJEXT) \
+ io.$(OBJEXT) osglue.$(OBJEXT) osinit.$(OBJEXT) utils.$(OBJEXT) \
+ waitfor.$(OBJEXT) xfstrans.$(OBJEXT)
+xfs_OBJECTS = $(am_xfs_OBJECTS)
+xfs_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+xfs_DEPENDENCIES = $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(xfs_SOURCES)
+DIST_SOURCES = $(xfs_SOURCES)
+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|^.*/||'`;
+appmanDATA_INSTALL = $(INSTALL_DATA)
+configDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(appman_DATA) $(config_DATA)
+ETAGS = etags
+CTAGS = ctags
+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@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@@ -116,13 +181,13 @@ VERSION = @VERSION@
XFS_CFLAGS = @XFS_CFLAGS@
XFS_LIBS = @XFS_LIBS@
ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -130,40 +195,41 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
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@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
configdir = $(sysconfdir)/X11/fs
-
-bin_PROGRAMS = xfs
-
FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
-
AM_CFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" \
-DDEFAULT_CONFIG_FILE=\"$(configdir)/config\" $(FONT_FLAGS) \
-D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
-
LDADD = $(XFS_LIBS)
-
xfs_SOURCES = \
difs/atom.c \
difs/cache.c \
@@ -223,32 +289,22 @@ xfs_SOURCES = \
include/swaprep.h \
include/swapreq.h
-
appman_PRE = \
xfs.man
-
FSERRORS = /var/log/xfs.log
-
FONTDIR = $(libdir)/X11/fonts
-
FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
-
config_DATA = config
-
EXTRA_DIST = xfs.def config.cpp $(appman_PRE)
CLEANFILES = config $(appman_DATA)
-
appmandir = $(APP_MAN_DIR)
-
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
-
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
@@ -256,6 +312,7 @@ MAN_SUBSTS = \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__apploaddir__|$(appdefaultdir)|' \
+ -e 's|__configdir__|$(configdir)|' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
@@ -263,80 +320,44 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
-e 's|XCOMM|\#|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = xfs$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_xfs_OBJECTS = atom.$(OBJEXT) cache.$(OBJEXT) charinfo.$(OBJEXT) \
- difsutils.$(OBJEXT) dispatch.$(OBJEXT) events.$(OBJEXT) \
- extensions.$(OBJEXT) fontinfo.$(OBJEXT) fonts.$(OBJEXT) \
- globals.$(OBJEXT) initfonts.$(OBJEXT) main.$(OBJEXT) \
- resource.$(OBJEXT) swaprep.$(OBJEXT) swapreq.$(OBJEXT) \
- tables.$(OBJEXT) access.$(OBJEXT) config.$(OBJEXT) \
- connection.$(OBJEXT) daemon.$(OBJEXT) error.$(OBJEXT) \
- io.$(OBJEXT) osglue.$(OBJEXT) osinit.$(OBJEXT) utils.$(OBJEXT) \
- waitfor.$(OBJEXT) xfstrans.$(OBJEXT)
-xfs_OBJECTS = $(am_xfs_OBJECTS)
-xfs_LDADD = $(LDADD)
-xfs_DEPENDENCIES =
-xfs_LDFLAGS =
-
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/access.Po ./$(DEPDIR)/atom.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/cache.Po ./$(DEPDIR)/charinfo.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/config.Po ./$(DEPDIR)/connection.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/daemon.Po ./$(DEPDIR)/difsutils.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/dispatch.Po ./$(DEPDIR)/error.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/events.Po ./$(DEPDIR)/extensions.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/fontinfo.Po ./$(DEPDIR)/fonts.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/globals.Po ./$(DEPDIR)/initfonts.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/io.Po ./$(DEPDIR)/main.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/osglue.Po ./$(DEPDIR)/osinit.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/resource.Po ./$(DEPDIR)/swaprep.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/swapreq.Po ./$(DEPDIR)/tables.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/utils.Po ./$(DEPDIR)/waitfor.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/xfstrans.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(xfs_SOURCES)
-DATA = $(appman_DATA) $(config_DATA)
-
-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 \
- config.guess config.h.in config.sub configure configure.ac \
- depcomp install-sh missing mkinstalldirs
-SOURCES = $(xfs_SOURCES)
-
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+am--refresh:
+ @:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+.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
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@@ -348,24 +369,23 @@ config.h: stamp-h1
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@ $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_srcdir) && $(AUTOHEADER)
- touch $(srcdir)/config.h.in
+ rm -f stamp-h1
+ touch $@
distclean-hdr:
-rm -f config.h stamp-h1
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
; 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; \
+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -373,8 +393,8 @@ 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; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
@@ -384,7 +404,7 @@ xfs$(EXEEXT): $(xfs_OBJECTS) $(xfs_DEPENDENCIES)
$(LINK) $(xfs_LDFLAGS) $(xfs_OBJECTS) $(xfs_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -418,666 +438,432 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfstrans.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
atom.o: difs/atom.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atom.o -MD -MP -MF "$(DEPDIR)/atom.Tpo" \
-@am__fastdepCC_TRUE@ -c -o atom.o `test -f 'difs/atom.c' || echo '$(srcdir)/'`difs/atom.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atom.Tpo" "$(DEPDIR)/atom.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/atom.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atom.o -MD -MP -MF "$(DEPDIR)/atom.Tpo" -c -o atom.o `test -f 'difs/atom.c' || echo '$(srcdir)/'`difs/atom.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atom.Tpo" "$(DEPDIR)/atom.Po"; else rm -f "$(DEPDIR)/atom.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/atom.c' object='atom.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/atom.Po' tmpdepfile='$(DEPDIR)/atom.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atom.o `test -f 'difs/atom.c' || echo '$(srcdir)/'`difs/atom.c
atom.obj: difs/atom.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atom.obj -MD -MP -MF "$(DEPDIR)/atom.Tpo" \
-@am__fastdepCC_TRUE@ -c -o atom.obj `if test -f 'difs/atom.c'; then $(CYGPATH_W) 'difs/atom.c'; else $(CYGPATH_W) '$(srcdir)/difs/atom.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atom.Tpo" "$(DEPDIR)/atom.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/atom.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atom.obj -MD -MP -MF "$(DEPDIR)/atom.Tpo" -c -o atom.obj `if test -f 'difs/atom.c'; then $(CYGPATH_W) 'difs/atom.c'; else $(CYGPATH_W) '$(srcdir)/difs/atom.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atom.Tpo" "$(DEPDIR)/atom.Po"; else rm -f "$(DEPDIR)/atom.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/atom.c' object='atom.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/atom.Po' tmpdepfile='$(DEPDIR)/atom.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atom.obj `if test -f 'difs/atom.c'; then $(CYGPATH_W) 'difs/atom.c'; else $(CYGPATH_W) '$(srcdir)/difs/atom.c'; fi`
cache.o: difs/cache.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.o -MD -MP -MF "$(DEPDIR)/cache.Tpo" \
-@am__fastdepCC_TRUE@ -c -o cache.o `test -f 'difs/cache.c' || echo '$(srcdir)/'`difs/cache.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cache.Tpo" "$(DEPDIR)/cache.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/cache.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.o -MD -MP -MF "$(DEPDIR)/cache.Tpo" -c -o cache.o `test -f 'difs/cache.c' || echo '$(srcdir)/'`difs/cache.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cache.Tpo" "$(DEPDIR)/cache.Po"; else rm -f "$(DEPDIR)/cache.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/cache.c' object='cache.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/cache.Po' tmpdepfile='$(DEPDIR)/cache.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cache.o `test -f 'difs/cache.c' || echo '$(srcdir)/'`difs/cache.c
cache.obj: difs/cache.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.obj -MD -MP -MF "$(DEPDIR)/cache.Tpo" \
-@am__fastdepCC_TRUE@ -c -o cache.obj `if test -f 'difs/cache.c'; then $(CYGPATH_W) 'difs/cache.c'; else $(CYGPATH_W) '$(srcdir)/difs/cache.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cache.Tpo" "$(DEPDIR)/cache.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/cache.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.obj -MD -MP -MF "$(DEPDIR)/cache.Tpo" -c -o cache.obj `if test -f 'difs/cache.c'; then $(CYGPATH_W) 'difs/cache.c'; else $(CYGPATH_W) '$(srcdir)/difs/cache.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cache.Tpo" "$(DEPDIR)/cache.Po"; else rm -f "$(DEPDIR)/cache.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/cache.c' object='cache.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/cache.Po' tmpdepfile='$(DEPDIR)/cache.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cache.obj `if test -f 'difs/cache.c'; then $(CYGPATH_W) 'difs/cache.c'; else $(CYGPATH_W) '$(srcdir)/difs/cache.c'; fi`
charinfo.o: difs/charinfo.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT charinfo.o -MD -MP -MF "$(DEPDIR)/charinfo.Tpo" \
-@am__fastdepCC_TRUE@ -c -o charinfo.o `test -f 'difs/charinfo.c' || echo '$(srcdir)/'`difs/charinfo.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/charinfo.Tpo" "$(DEPDIR)/charinfo.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/charinfo.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT charinfo.o -MD -MP -MF "$(DEPDIR)/charinfo.Tpo" -c -o charinfo.o `test -f 'difs/charinfo.c' || echo '$(srcdir)/'`difs/charinfo.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/charinfo.Tpo" "$(DEPDIR)/charinfo.Po"; else rm -f "$(DEPDIR)/charinfo.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/charinfo.c' object='charinfo.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/charinfo.Po' tmpdepfile='$(DEPDIR)/charinfo.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o charinfo.o `test -f 'difs/charinfo.c' || echo '$(srcdir)/'`difs/charinfo.c
charinfo.obj: difs/charinfo.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT charinfo.obj -MD -MP -MF "$(DEPDIR)/charinfo.Tpo" \
-@am__fastdepCC_TRUE@ -c -o charinfo.obj `if test -f 'difs/charinfo.c'; then $(CYGPATH_W) 'difs/charinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/charinfo.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/charinfo.Tpo" "$(DEPDIR)/charinfo.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/charinfo.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT charinfo.obj -MD -MP -MF "$(DEPDIR)/charinfo.Tpo" -c -o charinfo.obj `if test -f 'difs/charinfo.c'; then $(CYGPATH_W) 'difs/charinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/charinfo.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/charinfo.Tpo" "$(DEPDIR)/charinfo.Po"; else rm -f "$(DEPDIR)/charinfo.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/charinfo.c' object='charinfo.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/charinfo.Po' tmpdepfile='$(DEPDIR)/charinfo.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o charinfo.obj `if test -f 'difs/charinfo.c'; then $(CYGPATH_W) 'difs/charinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/charinfo.c'; fi`
difsutils.o: difs/difsutils.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT difsutils.o -MD -MP -MF "$(DEPDIR)/difsutils.Tpo" \
-@am__fastdepCC_TRUE@ -c -o difsutils.o `test -f 'difs/difsutils.c' || echo '$(srcdir)/'`difs/difsutils.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/difsutils.Tpo" "$(DEPDIR)/difsutils.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/difsutils.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT difsutils.o -MD -MP -MF "$(DEPDIR)/difsutils.Tpo" -c -o difsutils.o `test -f 'difs/difsutils.c' || echo '$(srcdir)/'`difs/difsutils.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/difsutils.Tpo" "$(DEPDIR)/difsutils.Po"; else rm -f "$(DEPDIR)/difsutils.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/difsutils.c' object='difsutils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/difsutils.Po' tmpdepfile='$(DEPDIR)/difsutils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o difsutils.o `test -f 'difs/difsutils.c' || echo '$(srcdir)/'`difs/difsutils.c
difsutils.obj: difs/difsutils.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT difsutils.obj -MD -MP -MF "$(DEPDIR)/difsutils.Tpo" \
-@am__fastdepCC_TRUE@ -c -o difsutils.obj `if test -f 'difs/difsutils.c'; then $(CYGPATH_W) 'difs/difsutils.c'; else $(CYGPATH_W) '$(srcdir)/difs/difsutils.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/difsutils.Tpo" "$(DEPDIR)/difsutils.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/difsutils.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT difsutils.obj -MD -MP -MF "$(DEPDIR)/difsutils.Tpo" -c -o difsutils.obj `if test -f 'difs/difsutils.c'; then $(CYGPATH_W) 'difs/difsutils.c'; else $(CYGPATH_W) '$(srcdir)/difs/difsutils.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/difsutils.Tpo" "$(DEPDIR)/difsutils.Po"; else rm -f "$(DEPDIR)/difsutils.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/difsutils.c' object='difsutils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/difsutils.Po' tmpdepfile='$(DEPDIR)/difsutils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o difsutils.obj `if test -f 'difs/difsutils.c'; then $(CYGPATH_W) 'difs/difsutils.c'; else $(CYGPATH_W) '$(srcdir)/difs/difsutils.c'; fi`
dispatch.o: difs/dispatch.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatch.o -MD -MP -MF "$(DEPDIR)/dispatch.Tpo" \
-@am__fastdepCC_TRUE@ -c -o dispatch.o `test -f 'difs/dispatch.c' || echo '$(srcdir)/'`difs/dispatch.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dispatch.Tpo" "$(DEPDIR)/dispatch.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/dispatch.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatch.o -MD -MP -MF "$(DEPDIR)/dispatch.Tpo" -c -o dispatch.o `test -f 'difs/dispatch.c' || echo '$(srcdir)/'`difs/dispatch.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dispatch.Tpo" "$(DEPDIR)/dispatch.Po"; else rm -f "$(DEPDIR)/dispatch.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/dispatch.c' object='dispatch.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/dispatch.Po' tmpdepfile='$(DEPDIR)/dispatch.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatch.o `test -f 'difs/dispatch.c' || echo '$(srcdir)/'`difs/dispatch.c
dispatch.obj: difs/dispatch.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatch.obj -MD -MP -MF "$(DEPDIR)/dispatch.Tpo" \
-@am__fastdepCC_TRUE@ -c -o dispatch.obj `if test -f 'difs/dispatch.c'; then $(CYGPATH_W) 'difs/dispatch.c'; else $(CYGPATH_W) '$(srcdir)/difs/dispatch.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dispatch.Tpo" "$(DEPDIR)/dispatch.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/dispatch.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatch.obj -MD -MP -MF "$(DEPDIR)/dispatch.Tpo" -c -o dispatch.obj `if test -f 'difs/dispatch.c'; then $(CYGPATH_W) 'difs/dispatch.c'; else $(CYGPATH_W) '$(srcdir)/difs/dispatch.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dispatch.Tpo" "$(DEPDIR)/dispatch.Po"; else rm -f "$(DEPDIR)/dispatch.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/dispatch.c' object='dispatch.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/dispatch.Po' tmpdepfile='$(DEPDIR)/dispatch.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatch.obj `if test -f 'difs/dispatch.c'; then $(CYGPATH_W) 'difs/dispatch.c'; else $(CYGPATH_W) '$(srcdir)/difs/dispatch.c'; fi`
events.o: difs/events.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT events.o -MD -MP -MF "$(DEPDIR)/events.Tpo" \
-@am__fastdepCC_TRUE@ -c -o events.o `test -f 'difs/events.c' || echo '$(srcdir)/'`difs/events.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/events.Tpo" "$(DEPDIR)/events.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/events.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT events.o -MD -MP -MF "$(DEPDIR)/events.Tpo" -c -o events.o `test -f 'difs/events.c' || echo '$(srcdir)/'`difs/events.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/events.Tpo" "$(DEPDIR)/events.Po"; else rm -f "$(DEPDIR)/events.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='difs/events.c' object='events.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/events.Po' tmpdepfile='$(DEPDIR)/events.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o events.o `test -f 'difs/events.c' || echo '$(srcdir)/'`difs/events.c
events.obj: difs/events.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT events.obj -MD -MP -MF "$(DEPDIR)/events.Tpo" \
-@am__fastdepCC_TRUE@ -c -o events.obj `if test -f 'difs/events.c'; then $(CYGPATH_W) 'difs/events.c'; else $(CYGPATH_W) '$(srcdir)/difs/events.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/events.Tpo" "$(DEPDIR)/events.Po"; \
-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/events.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@ fi
Reply to: