debian/changelog | 2 debian/patches/02_xev_flush_standard_output.diff | 8 debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff | 22 debian/xsfbs/xsfbs.mk | 103 -- debian/xsfbs/xsfbs.sh | 7 xev/ChangeLog | 209 +++- xev/INSTALL | 236 ---- xev/Makefile.am | 9 xev/Makefile.in | 160 +-- xev/aclocal.m4 | 222 ++-- xev/compile | 142 -- xev/config.guess | 32 xev/config.sub | 52 - xev/configure | 197 ++- xev/configure.ac | 3 xev/depcomp | 93 + xev/install-sh | 514 ++++++---- xev/missing | 61 - xev/xev.c | 24 19 files changed, 1103 insertions(+), 993 deletions(-)
New commits: commit a63010da8c518c3a7ff9b63a2e9673efd049ec82 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat Mar 8 02:41:43 2008 +0100 Refresh patches. diff --git a/debian/changelog b/debian/changelog index 494f7cf..3e5d006 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x11-utils (7.3+2) UNRELEASED; urgency=low upstream's COPYING file. * Drop patch for #291137, which is included in luit 1.0.3. * xev 1.0.3 + * Refresh patches. -- Julien Cristau <[EMAIL PROTECTED]> Fri, 01 Feb 2008 01:23:34 +0100 diff --git a/debian/patches/02_xev_flush_standard_output.diff b/debian/patches/02_xev_flush_standard_output.diff index f336ef6..9c4c381 100644 --- a/debian/patches/02_xev_flush_standard_output.diff +++ b/debian/patches/02_xev_flush_standard_output.diff @@ -6,11 +6,9 @@ unreachable code. This patch by Branden Robinson. Thanks to Bill Currie for identifying the problem and the solution. See Debian bug #238638. -Index: xbase-clients/xev/xev.c -=================================================================== ---- xbase-clients.orig/xev/xev.c 2006-02-18 14:56:32.000000000 -0500 -+++ xbase-clients/xev/xev.c 2006-02-26 19:50:37.000000000 -0500 -@@ -1045,6 +1045,7 @@ +--- x11-utils.orig/xev/xev.c ++++ x11-utils/xev/xev.c +@@ -1065,6 +1065,7 @@ printf ("Unknown event type %d\n", event.type); break; } diff --git a/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff b/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff index 2e8a872..e917678 100644 --- a/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff +++ b/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff @@ -10,10 +10,8 @@ The user should only be shown a usage messages when: Not submitted upstream to XFree86 or X.Org. -Index: xlsfonts/dsimple.c -=================================================================== ---- xlsfonts/dsimple.c.orig 2006-07-11 04:53:33.000000000 +0200 -+++ xlsfonts/dsimple.c 2007-02-11 08:14:45.000000000 +0100 +--- xlsfonts/dsimple.c.orig ++++ xlsfonts/dsimple.c @@ -188,8 +188,7 @@ if (d == NULL) { fprintf (stderr, "%s: unable to open display '%s'\n", @@ -24,11 +22,9 @@ Index: xlsfonts/dsimple.c } return(d); -Index: xprop/dsimple.c -=================================================================== ---- xprop/dsimple.c.orig 2007-02-11 08:15:17.000000000 +0100 -+++ xprop/dsimple.c 2007-02-11 08:15:40.000000000 +0100 -@@ -188,8 +188,7 @@ +--- xprop/dsimple.c.orig ++++ xprop/dsimple.c +@@ -122,8 +122,7 @@ if (d == NULL) { fprintf (stderr, "%s: unable to open display '%s'\n", program_name, XDisplayName (display_name)); @@ -38,11 +34,9 @@ Index: xprop/dsimple.c } return(d); -Index: xwininfo/dsimple.c -=================================================================== ---- xwininfo/dsimple.c.orig 2007-02-11 08:16:29.000000000 +0100 -+++ xwininfo/dsimple.c 2007-02-11 08:16:47.000000000 +0100 -@@ -188,8 +188,7 @@ +--- xwininfo/dsimple.c.orig ++++ xwininfo/dsimple.c +@@ -109,8 +109,7 @@ if (d == NULL) { fprintf (stderr, "%s: unable to open display '%s'\n", program_name, XDisplayName (display_name)); commit af1a9436f0af03ab92e48a8c4de07a0b49527bb4 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat Mar 8 02:37:44 2008 +0100 xev 1.0.3 diff --git a/debian/changelog b/debian/changelog index f242458..494f7cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x11-utils (7.3+2) UNRELEASED; urgency=low * Add copyright/license info for luit to debian/copyright, taken from upstream's COPYING file. * Drop patch for #291137, which is included in luit 1.0.3. + * xev 1.0.3 -- Julien Cristau <[EMAIL PROTECTED]> Fri, 01 Feb 2008 01:23:34 +0100 diff --git a/xev/ChangeLog b/xev/ChangeLog index b7f7baa..646debc 100644 --- a/xev/ChangeLog +++ b/xev/ChangeLog @@ -1,34 +1,201 @@ -2006-06-02 Daniel Stone <[EMAIL PROTECTED]> +commit d82fb133b9cd4d3284db553a0afdd530b466073e +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Dec 6 15:51:06 2007 -0500 - * configure.ac: - Bump to 1.0.2. + Add missing PHONY line for automatic ChangeLog generation - * xev.c: - Bug #6598: Run XFilterEvent() on all events, not just KeyPresses. - (Samuel Thibault) +commit 29a316c91b55a0ca193c9e902491f2ae78f33b76 +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Dec 6 05:13:52 2007 -0500 -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> + Replace static ChangeLog with dist-hook to generate from git log - * configure.ac: - Update package version for X11R7 release. +commit 49658a2112957b2b4874d2a9faccb6e501a0cda5 +Author: Noah Levitt <[EMAIL PROTECTED]> +Date: Thu Dec 6 05:03:41 2007 -0500 -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> + Handle WM_DELETE_WINDOW + From bug 319¹: + + Make xev exit on WM_DELETE_WINDOW. + + 1] https://bugs.freedesktop.org/show_bug.cgi?id=319 + + Signed-off-by: James Cloos <[EMAIL PROTECTED]> - * configure.ac: - Update package version number for final X11R7 release candidate. +commit 990e7b0b33e894eeb395b4023cd4d0b67773777b +Author: James Cloos <[EMAIL PROTECTED]> +Date: Mon Sep 3 05:51:20 2007 -0400 -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> + Add *~ to .gitignore to skip patch/emacs droppings - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. +commit ce1a508f11923e2bb29c8bd4fa87db57833ff5ec +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Aug 23 19:24:45 2007 -0400 -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> + Rename .cvsignore to .gitignore - * configure.ac: - Update package version number for X11R7 RC3 release. +commit ada7026e755141f534ba3ea00aee5bf90be997da +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Thu Jun 1 23:26:44 2006 +0000 -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> + Run XFilterEvent() on all events. (Samuel Thibault). Bump to 1.0.2. - * configure.ac: - Update package version number for RC1 release. +commit dd3eacf61876e6220aec7820ae16c534241a93ae +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Dec 21 02:29:49 2005 +0000 + Update package version for X11R7 release. + +commit d089b9b850eda5dd221f2c4567a2d0022bd2c92d +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Dec 19 16:22:43 2005 +0000 + + Stub COPYING files + +commit 8d5e61ab1da7bc4e5083a6ae86cb427df847e70a +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Thu Dec 15 00:24:06 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 810bc490f049b3a631eb84a57ea8a29537daef3f +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Tue Dec 6 22:48:21 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit d87e1dafa7c9b26417e5742badbcb9219142e33b +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Sat Dec 3 05:49:19 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit a620a594b3603353c997ca466bf2a8ed3a52d11c +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Nov 28 22:01:41 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 281463c1c846f943bb2851734f601479ca5ed08e +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Mon Nov 21 10:35:00 2005 +0000 + + Another pass at .cvsignores for apps. + +commit 50d5b9aa3c716de9062b83969ba2531b8557f944 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Sun Nov 20 22:08:52 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit e6de376cb8b61d53f39b5c8b9a1f234c5b067304 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Oct 19 02:47:53 2005 +0000 + + Update package version number for RC1 release. + +commit c435fcfb82d56ec362e937c498129f9593c4b57c +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Oct 17 23:56:22 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit 930548b75a4223298810d4fb4a8c56dede7cf351 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Fri Oct 14 00:25:44 2005 +0000 + + Use sed to fill in variables in man page + +commit 95d839f5a07fbef63001f969c1972b43219e4451 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Aug 1 20:25:29 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit f7296eec10d316c0bd94999aa261d92f6c51b3e8 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Fri Jul 29 21:22:32 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit b6296a1f365eb956f9716b7e72c33d2a026c0728 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Wed Jul 20 19:31:52 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit 275174c66316b789f96ec23974de50499ea3c5a2 +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Wed Jul 6 19:58:25 2005 +0000 + + Build system for xev + +commit ce51f5174dc2adea8b3f30478a4990dca53575e7 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Fri Apr 23 19:54:46 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 9a0286eaf44816896f13fe2a82760d5be6615220 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Sun Mar 14 08:35:19 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 0cff5a293401d7e4b720e4212778f17727c21f04 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Wed Mar 3 12:13:05 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit b4731d643c59e950f2bc464ee111ac925844ed3e +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 13:36:24 2004 +0000 + + readding XFree86's cvs IDs + +commit 66f2ab4130a03c321aa8aff19259584896c624d9 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 09:24:06 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 47403c0b506c2dde081952ea9e771fb0270c69a0 +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Mon Feb 23 20:35:40 2004 +0000 + + Import most of XFree86 4.4RC3. This import excludes files which have the + new license. If we want to, later we can import 4.4RC3 again and pick + up the files that have the new license, but for now the vendor branch + is "pure." + +commit 6c04e15469f547b18ccb393a0c740b7ac00132fb +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Tue Nov 25 19:29:12 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit a6c94bc03a1bb14661b1b0a26fbc5dab3f5e03b6 +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:49:22 2003 +0000 + + XFree86 4.3.0.1 + +commit f0692725ed2a9ce9d8909584bc673b7a4bcdad62 +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:49:22 2003 +0000 + + Initial revision diff --git a/xev/INSTALL b/xev/INSTALL index 23e5f25..e69de29 100644 --- a/xev/INSTALL +++ b/xev/INSTALL @@ -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/xev/Makefile.am b/xev/Makefile.am index ea7ed66..3af1bda 100644 --- a/xev/Makefile.am +++ b/xev/Makefile.am @@ -35,8 +35,9 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) +MAINTAINERCLEANFILES = ChangeLog SED = sed @@ -61,3 +62,9 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) +dist-hook: ChangeLog diff --git a/xev/Makefile.in b/xev/Makefile.in index c3ddcfd..42b46b1 100644 --- a/xev/Makefile.in +++ b/xev/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# 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 Free Software Foundation, Inc. +# 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. @@ -36,15 +36,11 @@ # 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 @@ -59,17 +55,17 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = xev$(EXEEXT) +subdir = . 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 = . + config.guess config.sub depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -80,7 +76,9 @@ am_xev_OBJECTS = xev-xev.$(OBJEXT) xev_OBJECTS = $(am_xev_OBJECTS) am__DEPENDENCIES_1 = xev_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +xev_LINK = $(CCLD) $(xev_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \ + $@ +DEFAULT_INCLUDES = [EMAIL PROTECTED]@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -113,8 +111,6 @@ 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@ @@ -137,6 +133,7 @@ ECHO_T = @ECHO_T@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,11 +145,10 @@ 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@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -168,9 +164,11 @@ STRIP = @STRIP@ VERSION = @VERSION@ XEV_CFLAGS = @XEV_CFLAGS@ XEV_LIBS = @XEV_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@ -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@ @@ -182,6 +180,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -209,8 +208,11 @@ 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@ xev_CFLAGS = $(XEV_CFLAGS) xev_LDADD = $(XEV_LIBS) xev_SOURCES = \ @@ -221,8 +223,9 @@ appman_PRE = \ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) +MAINTAINERCLEANFILES = ChangeLog SED = sed # Strings to replace in man pages @@ -284,7 +287,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -299,7 +302,7 @@ distclean-hdr: -rm -f config.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(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 \ @@ -322,7 +325,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) xev$(EXEEXT): $(xev_OBJECTS) $(xev_DEPENDENCIES) @rm -f xev$(EXEEXT) - $(LINK) $(xev_LDFLAGS) $(xev_OBJECTS) $(xev_LDADD) $(LIBS) + $(xev_LINK) $(xev_OBJECTS) $(xev_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -333,36 +336,35 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ .c.o: [EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi [EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< [EMAIL PROTECTED]@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: [EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi [EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` [EMAIL PROTECTED]@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` xev-xev.o: xev.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xev_CFLAGS) $(CFLAGS) -MT xev-xev.o -MD -MP -MF "$(DEPDIR)/xev-xev.Tpo" -c -o xev-xev.o `test -f 'xev.c' || echo '$(srcdir)/'`xev.c; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/xev-xev.Tpo" "$(DEPDIR)/xev-xev.Po"; else rm -f "$(DEPDIR)/xev-xev.Tpo"; exit 1; fi [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xev_CFLAGS) $(CFLAGS) -MT xev-xev.o -MD -MP -MF $(DEPDIR)/xev-xev.Tpo -c -o xev-xev.o `test -f 'xev.c' || echo '$(srcdir)/'`xev.c [EMAIL PROTECTED]@ mv -f $(DEPDIR)/xev-xev.Tpo $(DEPDIR)/xev-xev.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xev.c' object='xev-xev.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xev_CFLAGS) $(CFLAGS) -c -o xev-xev.o `test -f 'xev.c' || echo '$(srcdir)/'`xev.c xev-xev.obj: xev.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xev_CFLAGS) $(CFLAGS) -MT xev-xev.obj -MD -MP -MF "$(DEPDIR)/xev-xev.Tpo" -c -o xev-xev.obj `if test -f 'xev.c'; then $(CYGPATH_W) 'xev.c'; else $(CYGPATH_W) '$(srcdir)/xev.c'; fi`; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/xev-xev.Tpo" "$(DEPDIR)/xev-xev.Po"; else rm -f "$(DEPDIR)/xev-xev.Tpo"; exit 1; fi [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xev_CFLAGS) $(CFLAGS) -MT xev-xev.obj -MD -MP -MF $(DEPDIR)/xev-xev.Tpo -c -o xev-xev.obj `if test -f 'xev.c'; then $(CYGPATH_W) 'xev.c'; else $(CYGPATH_W) '$(srcdir)/xev.c'; fi` [EMAIL PROTECTED]@ mv -f $(DEPDIR)/xev-xev.Tpo $(DEPDIR)/xev-xev.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xev.c' object='xev-xev.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xev_CFLAGS) $(CFLAGS) -c -o xev-xev.obj `if test -f 'xev.c'; then $(CYGPATH_W) 'xev.c'; else $(CYGPATH_W) '$(srcdir)/xev.c'; fi` -uninstall-info-am: install-appmanDATA: $(appman_DATA) @$(NORMAL_INSTALL) - test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)" + test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)" @list='$(appman_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -383,8 +385,8 @@ ID: $(HEADERS) $(SOURCES) $(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; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -396,8 +398,8 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(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) \ @@ -407,13 +409,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ 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; } \ - END { for (i in files) print i; }'`; \ + $(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 @@ -428,23 +429,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + 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; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - 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; \ @@ -455,10 +455,13 @@ distdir: $(DISTFILES) || 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 $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -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 @@ -467,6 +470,10 @@ 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) @@ -494,6 +501,8 @@ distcheck: dist 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*) \ @@ -533,7 +542,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -557,7 +566,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(DATA) config.h installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -584,6 +593,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-binPROGRAMS clean-generic mostlyclean-am @@ -607,12 +617,20 @@ info-am: install-data-am: install-appmanDATA +install-dvi: install-dvi-am + install-exec-am: install-binPROGRAMS +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -634,27 +652,35 @@ ps: ps-am ps-am: -uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \ - uninstall-info-am +uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]