x11-utils: Changes to 'debian-unstable'
debian/changelog | 6
xwininfo/ChangeLog | 94 +-
xwininfo/INSTALL | 236 -----
xwininfo/Makefile.am | 2
xwininfo/Makefile.in | 147 +--
xwininfo/aclocal.m4 | 221 ++---
xwininfo/autogen.sh | 13
xwininfo/clientwin.c | 214 ++++
xwininfo/clientwin.h | 29
xwininfo/compile | 142 ---
xwininfo/config.guess | 105 +-
xwininfo/config.sub | 70 +
xwininfo/configure | 2098 ++++++++++++++++++++++++++-----------------------
xwininfo/configure.ac | 4
xwininfo/depcomp | 93 +-
xwininfo/dsimple.c | 8
xwininfo/dsimple.h | 2
xwininfo/install-sh | 514 ++++++++----
xwininfo/missing | 61 -
xwininfo/mkinstalldirs | 158 ---
xwininfo/xwininfo.c | 13
21 files changed, 2275 insertions(+), 1955 deletions(-)
New commits:
commit 54ed44e6cb8cc4fa8318ad014f4a772e78595f8b
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 1 20:43:50 2008 +0200
xwininfo 1.0.4
diff --git a/debian/changelog b/debian/changelog
index 0703da6..6f63595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-utils (7.4+1) UNRELEASED; urgency=low
+
+ * xwininfo 1.0.4.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 20:43:07 +0200
+
x11-utils (7.3+2) unstable; urgency=low
* Relax Replaces on xutils and xbase-clients to allow further updates.
diff --git a/xwininfo/ChangeLog b/xwininfo/ChangeLog
index eb3fcd5..13e7a3c 100644
--- a/xwininfo/ChangeLog
+++ b/xwininfo/ChangeLog
@@ -1,36 +1,52 @@
+commit b8115ee0e43c6c03025cad72219481e3fdb119d4
+Author: James Cloos <cloos@jhcloos.com>
+Date: Sun Jun 29 10:49:10 2008 -0400
+
+ xwininfo 1.0.4
+
+commit c229611bcb7ee94bea5c075f5e15447e14c0f6ce
+Author: Kim Woelders <kim@woelders.dk>
+Date: Sun Jun 22 01:11:50 2008 -0400
+
+ Fix window selection by pointer.
+
+ This should fix things in WM’s using virtual roots as well as in tabbing WM’s.
+
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
commit b7e88cd9d28a3d3e467b769f3efe87f7c2f4c0a5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Mon Aug 27 14:20:35 2007 -0700
+Date: Mon Aug 27 14:20:12 2007 -0700
Version bump: 1.0.3
commit 56f0b5dfb1486e262eb514fac44c73cea4bb4471
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Mon Aug 27 14:20:02 2007 -0700
+Date: Mon Aug 27 14:19:39 2007 -0700
Replace static ChangeLog with dist-hook to generate from git log
commit c8d205c30547ca526404a0b257c3cc5d40970be6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Tue Aug 7 15:50:13 2007 -0700
+Date: Tue Aug 7 15:49:50 2007 -0700
Add static & const qualifiers to xwininfo.c
commit 77d50c0bf824f847bd9ede30c21618845258de76
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Tue Aug 7 15:38:23 2007 -0700
+Date: Tue Aug 7 15:38:00 2007 -0700
Replace sprintf's with snprintf & strlcat
commit 118bd50a9bbc10cab7846fb6ac1a0d25ba4c3422
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Mon Aug 6 19:52:13 2007 -0700
+Date: Mon Aug 6 19:51:50 2007 -0700
dsimple.c: ANSIfy function declarations
commit e093e4be56bb2be385a972962cf89f234e987ab4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Mon Aug 6 19:44:24 2007 -0700
+Date: Mon Aug 6 19:44:01 2007 -0700
Purge unused code from dsimple.c
@@ -40,7 +56,7 @@ Date: Mon Aug 6 19:44:24 2007 -0700
commit 59bbe12a40fdb3d39429d0d0ce809ad28116e7ed
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Mon Aug 6 19:18:57 2007 -0700
+Date: Mon Aug 6 19:18:34 2007 -0700
Rename xwininfo_CFLAGS to AM_CFLAGS to make automake-1.10 happier
@@ -48,19 +64,19 @@ Date: Mon Aug 6 19:18:57 2007 -0700
commit 5a251886c0f158f4c8a342b6fbdeebf3dbd1c0fd
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Thu May 24 18:20:11 2007 -0700
+Date: Thu May 24 18:19:48 2007 -0700
Man page formatting: make -geometry bold like other options
commit 07459b14b36f15cfdfc6384019aaf020c7920cd4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Thu May 24 18:17:28 2007 -0700
+Date: Thu May 24 18:17:05 2007 -0700
renamed: .cvsignore -> .gitignore
commit 24fc2a569df9eaa776bcdddbb26bf4ea97b69d13
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Thu May 24 18:16:53 2007 -0700
+Date: Thu May 24 18:16:30 2007 -0700
X.Org bug #10616: Add all the X info commands to See Also in man page
@@ -70,75 +86,75 @@ Date: Thu May 24 18:16:53 2007 -0700
commit 412a3232373131634072df0d0b4843abf360def4
Author: Adam Jackson <ajax@nwnk.net>
-Date: Sun Apr 2 01:19:53 2006 +0000
+Date: Sun Apr 2 01:19:30 2006 +0000
Bump to 1.0.2.
commit 8d62050702532be39688d468663466199492510b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Fri Mar 10 02:37:18 2006 +0000
+Date: Fri Mar 10 02:36:55 2006 +0000
Clear two tiny memory leaks. (Coverity ids #900 & 901)
commit 609828be5a05bc71fffaf8fc129a0cae8082fd57
Author: Kevin E Martin <kem@kem.org>
-Date: Wed Dec 21 02:29:55 2005 +0000
+Date: Wed Dec 21 02:29:33 2005 +0000
Update package version for X11R7 release.
commit a4169ffa7eb6eb9a28fd64a0686a813da975736c
Author: Adam Jackson <ajax@nwnk.net>
-Date: Mon Dec 19 16:22:48 2005 +0000
+Date: Mon Dec 19 16:22:26 2005 +0000
Stub COPYING files
commit b9403df95678e568a326fe3f37bf29285a6a211e
Author: Kevin E Martin <kem@kem.org>
-Date: Thu Dec 15 00:24:12 2005 +0000
+Date: Thu Dec 15 00:23:50 2005 +0000
Update package version number for final X11R7 release candidate.
commit 6f9523999cc4eb34accfe0bcc2c7a74bae9259ef
Author: Kevin E Martin <kem@kem.org>
-Date: Tue Dec 6 22:48:27 2005 +0000
+Date: Tue Dec 6 22:48:05 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit 28c0455ea50bdf37f1d9d53c6756beebed429f0e
Author: Kevin E Martin <kem@kem.org>
-Date: Sat Dec 3 05:49:29 2005 +0000
+Date: Sat Dec 3 05:49:07 2005 +0000
Update package version number for X11R7 RC3 release.
commit 988471c67e10a5ca309b90146b37a6037f5b2efc
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Mon Nov 28 22:01:48 2005 +0000
+Date: Mon Nov 28 22:01:26 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 4496e95380b2f0ad7e9bdca02ec192dbb6d5e2e5
Author: Eric Anholt <anholt@freebsd.org>
-Date: Mon Nov 21 10:35:09 2005 +0000
+Date: Mon Nov 21 10:34:47 2005 +0000
Another pass at .cvsignores for apps.
commit 296d8e6ab8a86e5653529d0497ca5751d89f23b5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Mon Nov 21 03:14:17 2005 +0000
+Date: Mon Nov 21 03:13:55 2005 +0000
Change dependency from xmu to xmuu since the full xmu (with all its baggage
like Xt) is not needed here.
commit 27898506332f1a4e698cbd65aecc47fdbc6d0a7b
Author: Eric Anholt <anholt@freebsd.org>
-Date: Sun Nov 20 22:08:56 2005 +0000
+Date: Sun Nov 20 22:08:34 2005 +0000
Add/improve .cvsignore files for apps.
commit ee7bf4989434ba5f30451c3f07e4a6e01e6532d4
Author: Kevin E Martin <kem@kem.org>
-Date: Sat Nov 19 07:15:38 2005 +0000
+Date: Sat Nov 19 07:15:16 2005 +0000
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
@@ -146,33 +162,33 @@ Date: Sat Nov 19 07:15:38 2005 +0000
commit 4e58b0e12d46503c5f75ead9a859694aafd5b9b7
Author: Kevin E Martin <kem@kem.org>
-Date: Wed Oct 19 02:47:58 2005 +0000
+Date: Wed Oct 19 02:47:36 2005 +0000
Update package version number for RC1 release.
commit fc097904a8d7ded9a60df35fd58b9f5b5e226e17
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Mon Oct 17 23:56:25 2005 +0000
+Date: Mon Oct 17 23:56:03 2005 +0000
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
work better with BSD make
commit 22feb546d5bf499ec0bc726c60a6c46f2e2cbd1c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Fri Oct 14 00:25:48 2005 +0000
+Date: Fri Oct 14 00:25:26 2005 +0000
Use sed to fill in variables in man page
commit 9b1a4cbaf609bb102adec047934ad4c1b05f01ab
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Mon Aug 1 20:25:33 2005 +0000
+Date: Mon Aug 1 20:25:11 2005 +0000
Install man pages to section 1 instead of section m (Patch from Donnie
Berkholz)
commit 70ed22f5e63d5759a0b7c6574a92d124c0777562
Author: Kevin E Martin <kem@kem.org>
-Date: Fri Jul 29 21:22:39 2005 +0000
+Date: Fri Jul 29 21:22:17 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
@@ -186,20 +202,20 @@ Date: Fri Jul 29 21:22:39 2005 +0000
commit 270145dc0f3ad5c7ad7d6086da19c0a25ea853a9
Author: Adam Jackson <ajax@nwnk.net>
-Date: Wed Jul 20 19:32:05 2005 +0000
+Date: Wed Jul 20 19:31:43 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 97aa768841e147fde3cf16ba9a4c852358085d27
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
-Date: Fri Jul 8 21:00:46 2005 +0000
+Date: Fri Jul 8 21:00:24 2005 +0000
Build system for xwininfo
commit 5cd08344c43c739c9a6837f1a60ae7c42e5afabe
Author: Roland Mainz <roland.mainz@nrubsig.org>
-Date: Wed Oct 6 19:29:59 2004 +0000
+Date: Wed Oct 6 19:29:37 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1518 - Add filter
support to "xlsfonts" that it can filter builtin-, glyph- and/or other
@@ -208,54 +224,54 @@ Date: Wed Oct 6 19:29:59 2004 +0000
commit ac7cc196b722ee4653326aee459f40ad16a260c1
Author: Egbert Eich <eich@suse.de>
-Date: Fri Apr 23 19:55:09 2004 +0000
+Date: Fri Apr 23 19:54:47 2004 +0000
Merging XORG-CURRENT into trunk
commit 43e099d499d4dbabb32ca0410175e0e1b814cd94
Author: Egbert Eich <eich@suse.de>
-Date: Sun Mar 14 08:35:54 2004 +0000
+Date: Sun Mar 14 08:35:32 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit cd710399eb415673c180f65080d685ee8d149361
Author: Egbert Eich <eich@suse.de>
-Date: Wed Mar 3 12:13:20 2004 +0000
+Date: Wed Mar 3 12:12:58 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 436a7ecb4b764394abcdd06fd99d6232c633cad1
Author: Egbert Eich <eich@suse.de>
-Date: Thu Feb 26 13:36:32 2004 +0000
+Date: Thu Feb 26 13:36:10 2004 +0000
readding XFree86's cvs IDs
commit 6dfbd3f819f10e4d04653df2074526860007968e
Author: Egbert Eich <eich@suse.de>
-Date: Thu Feb 26 09:24:18 2004 +0000
+Date: Thu Feb 26 09:23:56 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit a2fa980ce0e98c2bbc503d1d9fe51ab539b7ea46
Author: Egbert Eich <eich@suse.de>
-Date: Thu Jan 29 08:09:21 2004 +0000
+Date: Thu Jan 29 08:08:59 2004 +0000
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
commit 429530ba6f7699436d6f789a17550ec1a691c675
Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date: Tue Nov 25 19:29:23 2003 +0000
+Date: Tue Nov 25 19:29:01 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit be0f398fee08e03ab73ec0d580df688cc989fbaa
Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date: Fri Nov 14 16:49:24 2003 +0000
+Date: Fri Nov 14 16:49:02 2003 +0000
XFree86 4.3.0.1
commit 5e5a590668dc3ebe7e2cb568aad4c9c14021f2a2
Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date: Fri Nov 14 15:54:55 2003 +0000
+Date: Fri Nov 14 15:54:33 2003 +0000
R6.6 is the Xorg base-line
diff --git a/xwininfo/INSTALL b/xwininfo/INSTALL
index 23e5f25..e69de29 100644
--- a/xwininfo/INSTALL
+++ b/xwininfo/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/xwininfo/Makefile.am b/xwininfo/Makefile.am
index bb177d5..854f489 100644
--- a/xwininfo/Makefile.am
+++ b/xwininfo/Makefile.am
@@ -25,6 +25,8 @@ AM_CFLAGS = $(XWININFO_CFLAGS)
xwininfo_LDADD = $(XWININFO_LIBS)
xwininfo_SOURCES = \
+ clientwin.c \
+ clientwin.h \
dsimple.c \
dsimple.h \
xwininfo.c
diff --git a/xwininfo/Makefile.in b/xwininfo/Makefile.in
index c980439..ebea2c4 100644
--- a/xwininfo/Makefile.in
+++ b/xwininfo/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,29 +55,29 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = xwininfo$(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 \
- mkinstalldirs
-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
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ configure.lineno config.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_xwininfo_OBJECTS = dsimple.$(OBJEXT) xwininfo.$(OBJEXT)
+am_xwininfo_OBJECTS = clientwin.$(OBJEXT) dsimple.$(OBJEXT) \
+ xwininfo.$(OBJEXT)
xwininfo_OBJECTS = $(am_xwininfo_OBJECTS)
am__DEPENDENCIES_1 =
xwininfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -114,8 +110,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@
@@ -138,6 +132,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@
@@ -149,11 +144,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@
@@ -169,9 +163,11 @@ STRIP = @STRIP@
VERSION = @VERSION@
XWININFO_CFLAGS = @XWININFO_CFLAGS@
XWININFO_LIBS = @XWININFO_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@
@@ -183,6 +179,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@
@@ -210,11 +207,17 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AM_CFLAGS = $(XWININFO_CFLAGS)
xwininfo_LDADD = $(XWININFO_LIBS)
xwininfo_SOURCES = \
+ clientwin.c \
+ clientwin.h \
dsimple.c \
dsimple.h \
xwininfo.c
@@ -288,7 +291,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
@@ -303,7 +306,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 \
@@ -326,7 +329,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
xwininfo$(EXEEXT): $(xwininfo_OBJECTS) $(xwininfo_DEPENDENCIES)
@rm -f xwininfo$(EXEEXT)
- $(LINK) $(xwininfo_LDFLAGS) $(xwininfo_OBJECTS) $(xwininfo_LDADD) $(LIBS)
+ $(LINK) $(xwininfo_OBJECTS) $(xwininfo_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -334,26 +337,26 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clientwin.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsimple.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwininfo.Po@am__quote@
.c.o:
-@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
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ 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:
-@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
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ 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) '$<'`
-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) \
@@ -374,8 +377,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
@@ -387,8 +390,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) \
@@ -398,13 +401,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
@@ -419,23 +421,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; \
@@ -452,7 +453,7 @@ distdir: $(DISTFILES)
-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
@@ -461,6 +462,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)
@@ -488,6 +493,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*) \
@@ -527,7 +534,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 \
@@ -551,7 +558,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
@@ -602,12 +609,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
@@ -629,23 +644,25 @@ 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-hook dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-compile distclean-generic distclean-hdr \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-appmanDATA install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-compile distclean-generic \
+ distclean-hdr distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-appmanDATA install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
- uninstall-info-am
+ uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS
.PHONY: ChangeLog
diff --git a/xwininfo/aclocal.m4 b/xwininfo/aclocal.m4
index 2d86b12..35d0421 100644
--- a/xwininfo/aclocal.m4
+++ b/xwininfo/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
Reply to: