x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog | 1
debian/control | 9
debian/copyright | 35
debian/rules | 2
xtrap/COPYING | 12
xtrap/ChangeLog | 42
xtrap/INSTALL | 236 --
xtrap/Makefile.am | 159 -
xtrap/Makefile.in | 961 ---------
xtrap/XEKeybCtrl.c | 236 --
xtrap/XEKeybCtrl.h | 8
xtrap/aclocal.m4 | 1533 ---------------
xtrap/chparse.c | 406 ----
xtrap/chparse.h | 10
xtrap/compile | 142 -
xtrap/config.guess | 1516 ---------------
xtrap/config.h.in | 31
xtrap/config.sub | 1622 ----------------
xtrap/configure | 5209 -----------------------------------------------------
xtrap/configure.ac | 42
xtrap/depcomp | 530 -----
xtrap/install-sh | 323 ---
xtrap/missing | 360 ---
xtrap/xtrap.man | 216 --
xtrap/xtrapchar.c | 739 -------
xtrap/xtrapin.c | 276 --
xtrap/xtrapinfo.c | 88
xtrap/xtrapout.c | 292 --
xtrap/xtrapproto.c | 109 -
xtrap/xtrapreset.c | 85
xtrap/xtrapstats.c | 134 -
31 files changed, 7 insertions(+), 15357 deletions(-)
New commits:
commit c3695642d0c4d78c631abc0610b9b699993e1c24
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 6 12:00:45 2009 +0100
Remove xtrap (closes: #547547).
diff --git a/debian/changelog b/debian/changelog
index 815f81e..8bdff5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-xserver-utils (7.4+3) UNRELEASED; urgency=low
[ Julien Cristau ]
* Update xsetroot config.{guess,sub} for avr32 support (closes: #535715).
* Add README.source from xsfbs, and bump Standards-Version to 3.8.2.
+ * Remove xtrap (closes: #547547).
[ Brice Goglin ]
* xrandr 1.3.2.
diff --git a/debian/control b/debian/control
index 936ae3e..103855f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
libxaw7-dev (>= 1:1.0.1), libxext-dev (>= 1:1.0.0),
libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1),
libxrandr-dev (>= 2:1.2.99.3), libxt-dev (>= 1:1.0.0),
- libxtrap-dev (>= 1:1.0.0), libxxf86vm-dev (>= 1:1.0.0), xbitmaps, quilt,
+ libxxf86vm-dev (>= 1:1.0.0), xbitmaps, quilt,
x11proto-input-dev (>= 1.4), libxxf86misc-dev
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
@@ -26,7 +26,6 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
# xsetpointer: libxi-dev, libx11-dev, x11proto-input-dev (>= 1.4)
# xsetroot: libxmuu-dev, libx11-dev, xbitmaps
# xstdcmap: libxmu-dev, libx11-dev
-# xtrap: libx11-dev, libxtrap-dev
# xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
Standards-Version: 3.8.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils
@@ -37,10 +36,10 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (>= 1:7.0.0)
Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
- xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
+ xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
Replaces: xbase-clients (<< 1:7.3), xutils (<< 1:7.2),
iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
- xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
+ xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
Suggests: nickle, cairo-5c, xorg-docs-core
Description: X server utilities
An X client is a program that interfaces with an X server (almost always via
@@ -64,6 +63,4 @@ Description: X server utilities
- xsetmode and xsetpointer, tools for handling X Input devices;
- xsetroot, a tool for tailoring the appearance of the root window;
- xstdcmap, a utility to selectively define standard colormap properties;
- - xtrapchar, xtrapin, xtrapinfo, xtrapout, xtrapproto, xtrapreset, and
- xtrapstats, a group of sample clients that use the XTrap extension;
- xvidtune, a tool for customizing X server modelines for your monitor.
diff --git a/debian/copyright b/debian/copyright
index 16c9b69..a0f74a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
The contents of this package were downloaded from
http://xorg.freedesktop.org/releases/individual/app/
It contains the iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap, xrandr,
-xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap and
-xvidtune applications.
+xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap and xvidtune
+applications.
iceauth:
Copyright 1989, 1998 The Open Group
@@ -442,37 +442,6 @@ xstdcmap:
* *
* Author: Donna Converse, MIT X Consortium
-xtrap:
- Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1993 by Digital Equipment Corp.,
- Maynard, MA
-
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted,
- 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 Digital not be
- used in advertising or publicity pertaining to distribution of the
- software without specific, written prior permission.
-
- DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- DIGITAL 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.
-
- CONTRIBUTORS:
-
- Dick Annicchiarico
- Robert Chesler
- Dan Coutu
- Gene Durso
- Marc Evans
- Alan Jamison
- Mark Henry
- Ken Miller
-
xvidtune:
Copyright (c) 1995 Kaleb S. KEITHLEY
diff --git a/debian/rules b/debian/rules
index fe8fbf3..2cce569 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ 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
-DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer xsetroot xstdcmap xtrap xvidtune
+DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer xsetroot xstdcmap xvidtune
SUBDIRS=$(DEF_SUBDIRS)
BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
diff --git a/xtrap/AUTHORS b/xtrap/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/xtrap/COPYING b/xtrap/COPYING
deleted file mode 100644
index 7f33cbf..0000000
--- a/xtrap/COPYING
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
-
-Please submit updated COPYING files to the Xorg bugzilla:
-
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
diff --git a/xtrap/ChangeLog b/xtrap/ChangeLog
deleted file mode 100644
index 16f74ba..0000000
--- a/xtrap/ChangeLog
+++ /dev/null
@@ -1,42 +0,0 @@
-2006-05-12 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Bump to 1.0.2
-
-2006-05-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * Makefile.am:
- Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628>
- Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
-2005-10-13 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * Makefile.am:
- * configure.ac:
- Add shadow man pages for xtrap* programs
- Use sed to fill in variables in man page
diff --git a/xtrap/INSTALL b/xtrap/INSTALL
deleted file mode 100644
index 23e5f25..0000000
--- a/xtrap/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/xtrap/Makefile.am b/xtrap/Makefile.am
deleted file mode 100644
index 030969a..0000000
--- a/xtrap/Makefile.am
+++ /dev/null
@@ -1,159 +0,0 @@
-#
-# Copyright 2005 Red Hat, Inc.
-#
-# 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 Red Hat not be used in
-# advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission. Red Hat makes no
-# representations about the suitability of this software for any purpose. It
-# is provided "as is" without express or implied warranty.
-#
-# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-# EVENT SHALL RED HAT 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.
-
-
-bin_PROGRAMS = \
- xtrapchar \
- xtrapproto \
- xtrapin \
- xtrapout \
- xtrapstats \
- xtrapreset \
- xtrapinfo
-
-
-#
-# xtrapchar
-#
-xtrapchar_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapchar_LDADD = $(XTRAP_APP_LIBS)
-
-xtrapchar_SOURCES = \
- xtrapchar.c \
- chparse.c \
- chparse.h \
- XEKeybCtrl.c \
- XEKeybCtrl.h
-
-#
-# xtrapin
-#
-xtrapin_CFLAGS = $(XTRAP_APP_CFLAGS) -D_BSD_SOURCE
-xtrapin_LDADD = $(XTRAP_APP_LIBS)
-
-xtrapin_SOURCES = \
- xtrapin.c \
- XEKeybCtrl.c \
- XEKeybCtrl.h
-
-#
-# xtrapout
-#
-xtrapout_CFLAGS = $(XTRAP_APP_CFLAGS) -D_BSD_SOURCE
-xtrapout_LDADD = $(XTRAP_APP_LIBS)
-
-xtrapout_SOURCES = \
- xtrapout.c \
- XEKeybCtrl.c \
- XEKeybCtrl.h
-
-#
-# xtrapproto
-#
-xtrapproto_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapproto_LDADD = $(XTRAP_APP_LIBS)
-
-xtrapproto_SOURCES = \
- xtrapproto.c
-
-#
-# xtrapreset
-#
-xtrapreset_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapreset_LDADD = $(XTRAP_APP_LIBS)
-
-xtrapreset_SOURCES = \
- xtrapreset.c
-
-#
-# xtrapstats
-#
-xtrapstats_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapstats_LDADD = $(XTRAP_APP_LIBS)
-
-xtrapstats_SOURCES = \
- xtrapstats.c
-
-#
-# xtrapinfo
-#
-xtrapinfo_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapinfo_LDADD = $(XTRAP_APP_LIBS)
-
-xtrapinfo_SOURCES = \
- xtrapinfo.c \
- XEKeybCtrl.c \
- XEKeybCtrl.h
-
-appman_PRE = \
- xtrap.man
-
-
-APP_MAN_DIR_SUFFIX = $(APP_MAN_DIR:@mandir@/man%=%)
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) \
- $(man_shadows:=.@APP_MAN_SUFFIX@)
-
-BUILT_SOURCES = shadows.DONE
-
-EXTRA_DIST = $(appman_PRE)
-CLEANFILES = $(appman_DATA) $(BUILT_SOURCES)
-
-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)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
-
-man_shadows = \
- xtrapreset \
- xtrapinfo \
- xtrapstats \
- xtrapout \
- xtrapin \
- xtrapchar \
- xtrapproto
-
-shadows.DONE:
- -rm -f $(man_shadows:=.@APP_MAN_SUFFIX@)
- (for i in $(man_shadows:=.@APP_MAN_SUFFIX@) ; do \
- echo .so man$(APP_MAN_DIR_SUFFIX)/xtrap.$(APP_MAN_SUFFIX) > $$i; \
- done)
diff --git a/xtrap/Makefile.in b/xtrap/Makefile.in
deleted file mode 100644
index 94dd697..0000000
--- a/xtrap/Makefile.in
+++ /dev/null
@@ -1,961 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# 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.
-
-# 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 2005 Red Hat, Inc.
-#
-# 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 Red Hat not be used in
-# advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission. Red Hat makes no
-# representations about the suitability of this software for any purpose. It
-# is provided "as is" without express or implied warranty.
-#
-# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-# EVENT SHALL RED HAT 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.
-
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-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@
-bin_PROGRAMS = xtrapchar$(EXEEXT) xtrapproto$(EXEEXT) xtrapin$(EXEEXT) \
- xtrapout$(EXEEXT) xtrapstats$(EXEEXT) xtrapreset$(EXEEXT) \
- xtrapinfo$(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 \
- compile config.guess config.sub depcomp install-sh missing
-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 = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_xtrapchar_OBJECTS = xtrapchar-xtrapchar.$(OBJEXT) \
- xtrapchar-chparse.$(OBJEXT) xtrapchar-XEKeybCtrl.$(OBJEXT)
-xtrapchar_OBJECTS = $(am_xtrapchar_OBJECTS)
-am__DEPENDENCIES_1 =
-xtrapchar_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_xtrapin_OBJECTS = xtrapin-xtrapin.$(OBJEXT) \
- xtrapin-XEKeybCtrl.$(OBJEXT)
-xtrapin_OBJECTS = $(am_xtrapin_OBJECTS)
-xtrapin_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_xtrapinfo_OBJECTS = xtrapinfo-xtrapinfo.$(OBJEXT) \
- xtrapinfo-XEKeybCtrl.$(OBJEXT)
-xtrapinfo_OBJECTS = $(am_xtrapinfo_OBJECTS)
-xtrapinfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_xtrapout_OBJECTS = xtrapout-xtrapout.$(OBJEXT) \
- xtrapout-XEKeybCtrl.$(OBJEXT)
-xtrapout_OBJECTS = $(am_xtrapout_OBJECTS)
-xtrapout_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_xtrapproto_OBJECTS = xtrapproto-xtrapproto.$(OBJEXT)
-xtrapproto_OBJECTS = $(am_xtrapproto_OBJECTS)
-xtrapproto_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_xtrapreset_OBJECTS = xtrapreset-xtrapreset.$(OBJEXT)
-xtrapreset_OBJECTS = $(am_xtrapreset_OBJECTS)
-xtrapreset_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_xtrapstats_OBJECTS = xtrapstats-xtrapstats.$(OBJEXT)
-xtrapstats_OBJECTS = $(am_xtrapstats_OBJECTS)
-xtrapstats_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 = $(xtrapchar_SOURCES) $(xtrapin_SOURCES) $(xtrapinfo_SOURCES) \
- $(xtrapout_SOURCES) $(xtrapproto_SOURCES) \
- $(xtrapreset_SOURCES) $(xtrapstats_SOURCES)
-DIST_SOURCES = $(xtrapchar_SOURCES) $(xtrapin_SOURCES) \
- $(xtrapinfo_SOURCES) $(xtrapout_SOURCES) $(xtrapproto_SOURCES) \
- $(xtrapreset_SOURCES) $(xtrapstats_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)
-DATA = $(appman_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@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-APP_MAN_DIR = @APP_MAN_DIR@
-APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
-DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
-FILE_MAN_DIR = @FILE_MAN_DIR@
-FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIB_MAN_DIR = @LIB_MAN_DIR@
-LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MISC_MAN_DIR = @MISC_MAN_DIR@
-MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-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@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-XTRAP_APP_CFLAGS = @XTRAP_APP_CFLAGS@
-XTRAP_APP_LIBS = @XTRAP_APP_LIBS@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-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@
-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@
-
-#
-# xtrapchar
-#
-xtrapchar_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapchar_LDADD = $(XTRAP_APP_LIBS)
-xtrapchar_SOURCES = \
- xtrapchar.c \
- chparse.c \
- chparse.h \
- XEKeybCtrl.c \
- XEKeybCtrl.h
-
-
-#
-# xtrapin
-#
-xtrapin_CFLAGS = $(XTRAP_APP_CFLAGS) -D_BSD_SOURCE
-xtrapin_LDADD = $(XTRAP_APP_LIBS)
-xtrapin_SOURCES = \
- xtrapin.c \
- XEKeybCtrl.c \
- XEKeybCtrl.h
-
-
-#
-# xtrapout
-#
-xtrapout_CFLAGS = $(XTRAP_APP_CFLAGS) -D_BSD_SOURCE
-xtrapout_LDADD = $(XTRAP_APP_LIBS)
-xtrapout_SOURCES = \
- xtrapout.c \
- XEKeybCtrl.c \
- XEKeybCtrl.h
-
-
-#
-# xtrapproto
-#
-xtrapproto_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapproto_LDADD = $(XTRAP_APP_LIBS)
-xtrapproto_SOURCES = \
- xtrapproto.c
-
-
-#
-# xtrapreset
-#
-xtrapreset_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapreset_LDADD = $(XTRAP_APP_LIBS)
-xtrapreset_SOURCES = \
- xtrapreset.c
-
-
-#
-# xtrapstats
-#
-xtrapstats_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapstats_LDADD = $(XTRAP_APP_LIBS)
-xtrapstats_SOURCES = \
- xtrapstats.c
-
-
-#
-# xtrapinfo
-#
-xtrapinfo_CFLAGS = $(XTRAP_APP_CFLAGS)
-xtrapinfo_LDADD = $(XTRAP_APP_LIBS)
-xtrapinfo_SOURCES = \
- xtrapinfo.c \
- XEKeybCtrl.c \
- XEKeybCtrl.h
-
-appman_PRE = \
- xtrap.man
-
-APP_MAN_DIR_SUFFIX = $(APP_MAN_DIR:@mandir@/man%=%)
-appmandir = $(APP_MAN_DIR)
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) \
- $(man_shadows:=.@APP_MAN_SUFFIX@)
-
-BUILT_SOURCES = shadows.DONE
-EXTRA_DIST = $(appman_PRE)
-CLEANFILES = $(appman_DATA) $(BUILT_SOURCES)
-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)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-man_shadows = \
- xtrapreset \
- xtrapinfo \
- xtrapstats \
- xtrapout \
- xtrapin \
- xtrapchar \
- xtrapproto
-
-all: $(BUILT_SOURCES) config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
-am--refresh:
Reply to: