x11-apps: Changes to 'debian-unstable'
debian/changelog | 1
debian/copyright | 58 +++++
x11perf/ChangeLog | 334 +++++++++++++++++++++++++++++---
x11perf/INSTALL | 236 ----------------------
x11perf/Makefile.am | 10
x11perf/Makefile.in | 164 +++++++++------
x11perf/Xmark.man | 10
x11perf/aclocal.m4 | 238 +++++++++++++----------
x11perf/config.guess | 56 +++--
x11perf/config.h.in | 9
x11perf/config.sub | 78 ++++++-
x11perf/configure | 312 ++++++++++++++++--------------
x11perf/configure.ac | 3
x11perf/depcomp | 93 +++++++--
x11perf/do_blt.c | 114 +++++++++++
x11perf/do_tests.c | 24 ++
x11perf/install-sh | 514 ++++++++++++++++++++++++++++++++++----------------
x11perf/missing | 61 +++--
x11perf/mkinstalldirs | 158 ---------------
x11perf/x11perf.c | 167 +++++++++++++++-
x11perf/x11perf.h | 37 +++
x11perf/x11perf.man | 4
22 files changed, 1687 insertions(+), 994 deletions(-)
New commits:
commit 8e186d947600ae5c5c532d7fc890e83de7ab027b
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 8 01:39:35 2008 +0100
Add bitmap and xgc copyright information.
diff --git a/debian/copyright b/debian/copyright
index ce99a9a..70081cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,33 @@
The contents of this package were downloaded from
http://xorg.freedesktop.org/releases/individual/app/
-It contains the x11perf, xcalc, xclock, xcursorgen, xedit, xload,
-xmag, xmore, xwud, oclock, xbiff, xclipboard, xconsole, xditview,
-xeyes, xlogo, xman and xwd applications.
+It contains the bitmap, x11perf, xcalc, xclock, xcursorgen, xedit, xload, xmag,
+xmore, xwud, oclock, xbiff, xclipboard, xconsole, xditview, xeyes, xgc, xlogo,
+xman and xwd applications.
+
+bitmap:
+ Copyright 1988, 1993, 1998 The Open Group
+
+ 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.
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of The Open Group shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from The Open Group.
oclock:
Copyright 1989, 1998 The Open Group
@@ -295,6 +320,33 @@ xeyes:
other dealings in this Software without prior written authorization
from the X Consortium.
+xgc:
+ Copyright (c) 1991 X Consortium
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the X Consortium.
+
xload:
Copyright (c) 1989 X Consortium
commit fe6109ce071a959a7d151f221d8402cdc09d3263
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 8 01:32:29 2008 +0100
x11perf 1.5
diff --git a/debian/changelog b/debian/changelog
index e6a5152..30395ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-apps (7.3+2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Re-add bitmap (closes: #445097).
+ * x11perf 1.5
[ Brice Goglin ]
* Re-add xgc (closes: #460453).
diff --git a/x11perf/ChangeLog b/x11perf/ChangeLog
index 85e5fac..14bf773 100644
--- a/x11perf/ChangeLog
+++ b/x11perf/ChangeLog
@@ -1,52 +1,318 @@
-2006-03-02 Adam Jackson <ajax@freedesktop.org>
+commit 828c0323450eadaf040749c010918679f5e4fe53
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Mar 7 16:51:53 2008 -0500
- * configure.ac:
- Bump to 1.4.1 (was 1.0.1 because we screwed up during modularising).
+ x11perf-1.5
-2006-02-14 Keith Packard <keithp@keithp.com>
+commit 1540dc21e1ef7bb473af7616294e5730e38f66ec
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:37:08 2007 -0500
- * Makefile.am:
- * configure.ac:
- * x11perf.h:
- Split detection of Xrender and Xft.
- Add detection of MIT-SHM.
- Clean up CFLAGS in Makefile.am
+ Replace static ChangeLog with dist-hook to generate from git log
-2006-02-13 Eric Anholt <anholt@FreeBSD.org>
+commit b1c5b72bb4bb5f3e116255f9d04b368137ff25f7
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date: Thu Nov 1 09:13:43 2007 +0100
- * configure.ac:
- * x11perf.c:
- * x11perf.h:
- Detect when Render is available and turn those tests on.
+ Fix typos in descriptions of -compwinwin{1,5}00.
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 569a5eaaef9a5c8bf50f1323fe39e81347976875
+Merge: 55aa9c2... e906fe5...
+Author: Keith Packard <keithp@koto.keithp.com>
+Date: Mon Sep 10 16:56:06 2007 +0100
- * configure.ac:
- Update package version for X11R7 release.
+ Merge branch 'origin'
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 55aa9c238c5d81c9dc0f679dfd2fea00f356247b
+Author: Keith Packard <keithp@koto.keithp.com>
+Date: Mon Sep 10 16:12:29 2007 +0100
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Add Compositing tests.
+
+ -compwinwinXX, -comppixwinXX where XX is 10, 100 or 500.
+
+ -pop <POP> <POP> ... where <POP> is one of Clear, Src, Dst, Over,
+ OverReverse, In, InReverse, Out, OutReverse, Atop, AtopReverse, Xor, Add or
+ Saturate.
+
+ -format <FORMAT> <FORMAT> ... where <FORMAT> is one of RGB24, ARGB32, A8,
+ A4, A1 or NATIVE
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 8b3b9d1d1d3a255000fb43bd09c62ef1e0798023
+Author: Keith Packard <keithp@koto.keithp.com>
+Date: Mon Sep 10 16:08:51 2007 +0100
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Rename .cvsignore to .gitignore
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e906fe589a852e9b4af4aac6c72580494139a0b7
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Tue Jan 2 10:07:00 2007 -0800
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bug 9520: Markup problems in Xmark.1x
+
+ X.Org Bugzilla #9520 <https://bugs.freedesktop.org/show_bug.cgi?id=9520>
-2005-11-20 Alan Coopersmith <alan.coopersmith@sun.com>
+commit d36c3c0e7db2254dc1385fe7ffc187797e109e0e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Apr 11 15:45:48 2007 -0700
- * configure.ac:
- Change dependency from xmu to xmuu since the full xmu
- (with all its baggage like Xt) is not needed here.
+ Another man page typo fix: s/aprox./approx./
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e9bb1f2d13cad8240cc95f1aae19316fe7568cbd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Apr 11 15:41:27 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ renamed: .cvsignore -> .gitignore
+commit ad4686b388da891ca07fba41a748ea90a3bb15cb
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Apr 11 15:39:23 2007 -0700
+
+ Bug #10616: Man page typo: s/peform/perform/
+
+ X.Org Bugzilla #10616 <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
+ Reported upstream from
+ Debian Bug #395445 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=395445>
+
+commit fabb885e8db6dd54d31b7223e9bb4f5d9e835d8c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu Mar 2 23:36:27 2006 +0000
+
+ Bump to 1.4.1 (was 1.0.1 because we screwed up during modularising).
+
+commit 21ce0f2bab1743ed15474ba1468286d6782bf781
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Feb 14 16:33:38 2006 +0000
+
+ Split detection of Xrender and Xft. Add detection of MIT-SHM. Clean up
+ CFLAGS in Makefile.am
+
+commit 32393ee83c8ad63dbb54aab709cdd4dc5802a74c
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Tue Feb 14 02:48:22 2006 +0000
+
+ Detect when Render is available and turn those tests on.
+
+commit d121367a04832aafb27800283bac5ce35365d84e
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:48 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 883de694b5dac055f0d7fd33cb84ee10c080ba8c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:42 2005 +0000
+
+ Stub COPYING files
+
+commit 2c3643dc1503b7e9136f678e0af238d507acf262
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:04 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 8e9f6aa0f81fa57e8b08684a1110e945f6f0dacd
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:19 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit e09f755a36b9848a7c76013d324713b1ee5cf0e3
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:18 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 9a94217191edf8e719ff9d4fbf485b5c33d0bde3
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:39 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 95895b619909e2b9f2e144e972b83aee6595d5f3
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:34:58 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 67eaa3cc45db8ab1a9aedb4675a09d5a3db31a7f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 21 03:14:15 2005 +0000
+
+ Change dependency from xmu to xmuu since the full xmu (with all its baggage
+ like Xt) is not needed here.
+
+commit 583d5d1c988ab24c61e2bbb21a5e5847328e86ec
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:50 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 2350482506abae44fcf656a3383c354ac2910d34
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:50 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit a489b54c63515aa2be297ef340501b1b7ef09423
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:21 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 4ac6e7bffbd29ae179fbc053a8317db4fa2f3f75
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Oct 14 00:25:42 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 64a324c6ffd7ba8a9bce52d41db3e63d77b69eca
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Oct 6 20:04:20 2005 +0000
+
+ Strip .sh from filenames of scripts to match the way they are installed by
+ the monolith
+
+commit eb51653deaa7a8cac0bac02f4a1fe4cd8291590b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Oct 6 03:47:12 2005 +0000
+
+ Fix file names of beforelight, x11perfcomp, and xlsclients man pages
+
+commit eb44ab57c5e989429f94bb67d01abaef70b9174d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 20:25:28 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit a1e27c9edcb4b99a0550e674dea66bd1d3111747
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:30 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 9dc00b804b6283a6371cae136f0c4abc743e3462
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Jul 28 15:57:12 2005 +0000
+
+ Fix distcheck for remaining apps
+
+commit 8b5dc957345bbee8349340e345a6a06ec42a16e8
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Jul 26 18:58:15 2005 +0000
+
+ Use AC_TYPE_SIGNAL and AC_FUNC_VFORK to replace Imake's SIGNAL_DEFINES and
+ -DHAS_VFORK
+
+commit 74c819bed573af85aabd92f023c885e53fb0cf77
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Jul 26 18:55:42 2005 +0000
+
+ Add config.h includes for modularization Use RETSIGTYPE if defined by
+ autoconf in addition to Imake's SIGNALRETURNSINT. Use
+ HAVE_WORKING_VFORK if defined by autoconf in addition to Imake's
+ HAS_VFORK
+
+commit 81a51fb38778c54442657142cf5d57fae4ac3e0e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Jul 20 19:31:51 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 2975cf615c2e0b79c3392d6d95b393ce4b0fd312
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Jul 16 23:29:38 2005 +0000
+
+ x11perf/Makefile.am: xinit/Makefile.am: xvidtune/Makefile.am:
+ - Replace $< with portable macro xinit/Makefile.am: xinit/configure.ac:
+ xvidtune/Makefile.am: xvidtune/configure.ac:
+ - Use more portable cpp invocations for pre-processing files
+ xfs/configure.ac:
+ - Add XTRANS_CONNECTION_FLAGS so xtrans transport type defines are set
+ correctly
+
+commit 68ebb5b755791822c2f1d9f9659c2ee94bb63f1c
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jun 29 20:41:01 2005 +0000
+
+ Add x11perf build system Add some x11perf shell script to symlink.sh
+
+commit 21b7ff0b54fcf28e933738aaaedf5aef46880717
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Aug 11 08:05:31 2004 +0000
+
+ - Fix the build with old libXrender headers installed by including
+ TOP_INCLUDES first in the INCLUDES line.
+ - Drive-by fix of unused variables warnings in do_traps.c.
+
+commit 9f86498395945e52accedc6bf3d938c2d21abd5d
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Aug 6 23:42:11 2004 +0000
+
+ Add RenderAddTraps. Rewrite trapezoid rendering code.
+
+commit cc61a0dd9da513e24a0c39793e4e70237a8d35b5
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:38 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 3208453773436841fd97a5a841f75aea2a84ea07
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:34:59 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit c090b9c09ddb3f21983506a90418d6e5387cbd94
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit c501072fc6aae9867785226575d87b6a3d89ecaa
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:16 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 767875979a99fba9d7c00fd9eb7da316d88596dc
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:58 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit c3ee38aec0f064a3916ecef9a29ecf6538a794a1
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:29:03 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit ee11b04c48b57b74beacd0a905fbc96a86c75931
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 76312369bde4267f6405a4e1d26697258cc06b32
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ Initial revision
+
+commit d7d99c8433b3bd35c8bad352ebd1fc49cff45264
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:53 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/x11perf/INSTALL b/x11perf/INSTALL
index 23e5f25..e69de29 100644
--- a/x11perf/INSTALL
+++ b/x11perf/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/x11perf/Makefile.am b/x11perf/Makefile.am
index d635909..b820545 100644
--- a/x11perf/Makefile.am
+++ b/x11perf/Makefile.am
@@ -96,3 +96,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.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/x11perf/Makefile.in b/x11perf/Makefile.in
index 8271c81..43b5bb0 100644
--- a/x11perf/Makefile.in
+++ b/x11perf/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.
@@ -37,15 +37,11 @@
-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
@@ -60,19 +56,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = x11perf$(EXEEXT)
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_x11perfcomp_SCRIPTS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS config.guess config.sub depcomp \
- install-sh missing mkinstalldirs
-subdir = .
+ 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)$(bindir)" \
@@ -92,7 +88,7 @@ x11perf_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
dist_x11perfcompSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS) $(dist_x11perfcomp_SCRIPTS)
-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) \
@@ -125,8 +121,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@
@@ -149,6 +143,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@
@@ -160,11 +155,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@
@@ -187,9 +181,11 @@ XFT_CFLAGS = @XFT_CFLAGS@
XFT_LIBS = @XFT_LIBS@
XRENDER_CFLAGS = @XRENDER_CFLAGS@
XRENDER_LIBS = @XRENDER_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@
@@ -201,6 +197,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@
@@ -228,8 +225,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@
bin_SCRIPTS = x11perfcomp
LIBPATH = $(libdir)/X11/x11perfcomp
x11perfcompdir = $(LIBPATH)
@@ -263,7 +263,7 @@ appman_PRE = \
Xmark.man
CLEANFILES = $(bin_SCRIPTS) x11perfcomp $(appman_DATA)
-EXTRA_DIST = x11pcomp.cpp $(appman_PRE)
+EXTRA_DIST = x11pcomp.cpp $(appman_PRE) ChangeLog
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
@@ -284,6 +284,7 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -326,7 +327,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
@@ -341,7 +342,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 \
@@ -364,10 +365,10 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
x11perf$(EXEEXT): $(x11perf_OBJECTS) $(x11perf_DEPENDENCIES)
@rm -f x11perf$(EXEEXT)
- $(LINK) $(x11perf_LDFLAGS) $(x11perf_OBJECTS) $(x11perf_LDADD) $(LIBS)
+ $(LINK) $(x11perf_OBJECTS) $(x11perf_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
@@ -386,7 +387,7 @@ uninstall-binSCRIPTS:
done
install-dist_x11perfcompSCRIPTS: $(dist_x11perfcomp_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(x11perfcompdir)" || $(mkdir_p) "$(DESTDIR)$(x11perfcompdir)"
+ test -z "$(x11perfcompdir)" || $(MKDIR_P) "$(DESTDIR)$(x11perfcompdir)"
@list='$(dist_x11perfcomp_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
@@ -429,22 +430,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11perf.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) \
@@ -465,8 +465,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
@@ -478,8 +478,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) \
@@ -489,13 +489,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
@@ -510,23 +509,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 \
Reply to: