xrandr 1.3.3
This commit is contained in:
Cyril Brulebois
parent
6a0c26eee5
commit
9c994e7c59
|
|
@ -1,5 +1,6 @@
|
||||||
x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
|
x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
[ Julien Cristau ]
|
||||||
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
|
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
|
||||||
good reason. Thanks, Colin Watson!
|
good reason. Thanks, Colin Watson!
|
||||||
* Remove myself from Uploaders
|
* Remove myself from Uploaders
|
||||||
|
|
@ -8,6 +9,10 @@ x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
|
||||||
* Drop XS- prefix from Vcs-* control fields.
|
* Drop XS- prefix from Vcs-* control fields.
|
||||||
* Drop Pre-Depends on x11-common, only needed for upgrades from sarge.
|
* Drop Pre-Depends on x11-common, only needed for upgrades from sarge.
|
||||||
|
|
||||||
|
[ Cyril Brulebois ]
|
||||||
|
* xrandr 1.3.3.
|
||||||
|
+ Fix segmentation fault on “xrandr --transform none” (closes: #579542).
|
||||||
|
|
||||||
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:13 +0000
|
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:13 +0000
|
||||||
|
|
||||||
x11-xserver-utils (7.5+1) unstable; urgency=low
|
x11-xserver-utils (7.5+1) unstable; urgency=low
|
||||||
|
|
|
||||||
288
xrandr/ChangeLog
288
xrandr/ChangeLog
|
|
@ -1,3 +1,281 @@
|
||||||
|
commit a06506ca5df0a69e0ca27845855187ff62b78a9d
|
||||||
|
Author: Julien Cristau <jcristau@debian.org>
|
||||||
|
Date: Mon Jul 19 18:07:56 2010 +0100
|
||||||
|
|
||||||
|
Bump to 1.3.3
|
||||||
|
|
||||||
|
commit 2cc54b2f6280cc2e5519b572f960ecef36d750ac
|
||||||
|
Author: Julien Cristau <jcristau@debian.org>
|
||||||
|
Date: Mon Jul 19 18:06:56 2010 +0100
|
||||||
|
|
||||||
|
Require xorg-macros 1.4 for XORG_INSTALL
|
||||||
|
|
||||||
|
commit 7e6b0adcbd6c9e691b538f99536dcd7106ed1f6a
|
||||||
|
Author: Julien Cristau <jcristau@debian.org>
|
||||||
|
Date: Mon Jul 19 18:05:37 2010 +0100
|
||||||
|
|
||||||
|
Kill cvs keyword
|
||||||
|
|
||||||
|
commit 61fc9cc04e1ac179ac5e2cc4ff861bb362f0b801
|
||||||
|
Author: Eric Piel <eric@triangle.(none)>
|
||||||
|
Date: Sun Jan 10 00:08:53 2010 +0100
|
||||||
|
|
||||||
|
xrandr: get gamma and brightness
|
||||||
|
|
||||||
|
Even in verbose query mode, gamma and brigthness were not displayed.
|
||||||
|
That's because they are not stored in the server the same way they are
|
||||||
|
specified on the command line: they are stored as 256 * 3 u16 while
|
||||||
|
the command line is 3 + 1 floats. Still, this is useful info for the
|
||||||
|
users, and they don't care about how it's stored in the server.
|
||||||
|
|
||||||
|
So we do a regression over the values stored to recover info in the same
|
||||||
|
way as on the command line: gamma and brightness.
|
||||||
|
|
||||||
|
Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
|
||||||
|
Reviewed-By: Matthias Hopf <mhopf@suse.de>
|
||||||
|
|
||||||
|
commit b5627bb72b3ca2c7f5a702b7134a5c6dd4f83687
|
||||||
|
Author: Eric Piel <eric@triangle.(none)>
|
||||||
|
Date: Sun Jan 10 00:08:53 2010 +0100
|
||||||
|
|
||||||
|
xrandr: fix maximum gamma set
|
||||||
|
|
||||||
|
Gamma is an array of 3 16-bit values. Currently, the maximum value assigned is
|
||||||
|
255*256, which is only 65280. Make sure that when we set the gamma, the maximum
|
||||||
|
value is 65535. It's slightly brighter but also helps to avoid kludges to
|
||||||
|
detect clamped values when reading back the gamma.
|
||||||
|
|
||||||
|
Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
|
||||||
|
Reviewed-by: Matthias Hopf <mhopf@suse.de>
|
||||||
|
|
||||||
|
commit d138c73276226ce424d36e80ce745aa9461f110e
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Thu Feb 11 10:08:07 2010 -0500
|
||||||
|
|
||||||
|
config: move CWARNFLAGS from configure.ac to Makefile.am
|
||||||
|
|
||||||
|
Compiler warning flags should be explicitly set in the makefile
|
||||||
|
rather than being merged with other packages compiler flags.
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit ac6606d8da914610446c5327813798bfbba4d6c2
|
||||||
|
Author: Éric Piel <eric.piel@tremplin-utc.net>
|
||||||
|
Date: Wed Jan 6 14:42:15 2010 +0100
|
||||||
|
|
||||||
|
xrandr: fix brightness to prevent gamma to overflow and to allow 0
|
||||||
|
|
||||||
|
With the new brightness option, gamma would overflow with values > 1,
|
||||||
|
leading to rainbow looking screen.
|
||||||
|
|
||||||
|
In addition, have the brightness by default to 1, so that specifying 0
|
||||||
|
actually does the expected behaviour of leading to a black screen.
|
||||||
|
|
||||||
|
Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
|
||||||
|
Reviewed-by: Matthias Hopf <mhopf@suse.de>
|
||||||
|
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
|
||||||
|
|
||||||
|
commit ccb3f8a42b25819cd1812f179544b52c2f03d1aa
|
||||||
|
Author: Yann Droneaud <ydroneaud@mandriva.com>
|
||||||
|
Date: Tue Nov 17 15:39:02 2009 +0100
|
||||||
|
|
||||||
|
xrandr: Remove --clone / --extend support code
|
||||||
|
|
||||||
|
Code handling --clone and --extend is not used.
|
||||||
|
The usage message regarding those options was already commented out.
|
||||||
|
|
||||||
|
Signed-off-by: Yann Droneaud <ydroneaud@mandriva.com>
|
||||||
|
Acked-by: Matthias Hopf <mhopf@suse.de>
|
||||||
|
|
||||||
|
commit 1f8e27cd71560c154f6b1f7472ae2518f5df10e0
|
||||||
|
Author: Matthias Hopf <mhopf@suse.de>
|
||||||
|
Date: Tue Jan 5 14:58:42 2010 +0100
|
||||||
|
|
||||||
|
Language fixes.
|
||||||
|
|
||||||
|
commit 5f7d052d63875f059f5693c68ee9fdf559ad5300
|
||||||
|
Author: Yann Droneaud <ydroneaud@mandriva.com>
|
||||||
|
Date: Tue Nov 17 15:39:01 2009 +0100
|
||||||
|
|
||||||
|
xrandr: Use a prefix for enum type _policy and _relation like other enums in xrandr.c
|
||||||
|
|
||||||
|
Try to apply the same coding style to enum _policy and enum _relation.
|
||||||
|
|
||||||
|
This patch also workarounds bug #12958 .
|
||||||
|
|
||||||
|
Signed-off-by: Yann Droneaud <ydroneaud@mandriva.com>
|
||||||
|
Acked-by: Matthias Hopf <mhopf@suse.de>
|
||||||
|
|
||||||
|
commit b481bd0df87c6b474d8c443b6590bbafac482485
|
||||||
|
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
|
||||||
|
Date: Sun Oct 25 03:41:05 2009 +0600
|
||||||
|
|
||||||
|
Add --brightness for CRTC
|
||||||
|
|
||||||
|
--brightness n.m adjusts gamma set for CRTC in order to compensate
|
||||||
|
for overly bright or overly dark unmanageable outputs.
|
||||||
|
|
||||||
|
Signed-off-by: Matthias Hopf <mhopf@suse.de>
|
||||||
|
|
||||||
|
commit 7d463218c584b683c9946cbff44bc69115eaa11b
|
||||||
|
Author: Matthias Hopf <mhopf@suse.de>
|
||||||
|
Date: Sun Jan 3 00:40:19 2010 +0100
|
||||||
|
|
||||||
|
xrandr: add more information about the transform option in the manpage
|
||||||
|
|
||||||
|
Add information about the transformation, stating it's a homogeneous
|
||||||
|
coordinate transformation and adding the (simplified) pixel calculation
|
||||||
|
formula. Also and an example of keystone shaping generated using the algorithm
|
||||||
|
found in xkeystone.
|
||||||
|
|
||||||
|
Based on a patch by Eric Piel <eric.piel@tremplin-utc.net>
|
||||||
|
|
||||||
|
Signed-off-by: Matthias Hopf <mhopf@suse.de>
|
||||||
|
|
||||||
|
commit 27f86db064a5ea60b942fd3d3ddeb462d980df9b
|
||||||
|
Author: Dominik Jasiok <yahoo.com.pl@gmail.com>
|
||||||
|
Date: Tue Dec 22 10:48:04 2009 -0800
|
||||||
|
|
||||||
|
xrandr: check_strtod should return double, not int
|
||||||
|
|
||||||
|
check_strtod performs error checking around strtod to ensure that
|
||||||
|
arguments are correctly processed. However, it also accidentally(?)
|
||||||
|
cast the result to int, which was then universally cast back to double
|
||||||
|
by all callers. Narrowing and re-widening the type doesn't make any sense.
|
||||||
|
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
|
||||||
|
commit df254d851cae1dcd1032e307bc828a5800e7342c
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Thu Nov 26 09:19:54 2009 -0500
|
||||||
|
|
||||||
|
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
|
||||||
|
|
||||||
|
Now that the INSTALL file is generated.
|
||||||
|
Allows running make maintainer-clean.
|
||||||
|
|
||||||
|
commit 22c90544537e661b71705c59e35616abb5aa4e55
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Wed Oct 28 14:09:08 2009 -0400
|
||||||
|
|
||||||
|
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
|
||||||
|
|
||||||
|
Add missing INSTALL file. Use standard GNU file on building tarball
|
||||||
|
README may have been updated
|
||||||
|
Remove AUTHORS file as it is empty and no content available yet.
|
||||||
|
Remove NEWS file as it is empty and no content available yet.
|
||||||
|
|
||||||
|
commit 35ffd6a8768e16d6fc7bc7c840e35a7802796b21
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Tue Oct 27 15:07:25 2009 -0400
|
||||||
|
|
||||||
|
Deploy the new XORG_DEFAULT_OPTIONS #24242
|
||||||
|
|
||||||
|
This macro aggregate a number of existing macros that sets commmon
|
||||||
|
X.Org components configuration options. It shields the configuration file from
|
||||||
|
future changes.
|
||||||
|
|
||||||
|
commit a397f434db4f30e22534b8fe684b8f67f493db40
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Mon Oct 26 22:08:39 2009 -0400
|
||||||
|
|
||||||
|
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
|
||||||
|
|
||||||
|
ChangeLog filename is known to Automake and requires no further
|
||||||
|
coding in the makefile.
|
||||||
|
|
||||||
|
commit 436a873b54990b77ac8024e20284de53c58c7850
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Thu Oct 22 12:34:16 2009 -0400
|
||||||
|
|
||||||
|
.gitignore: use common defaults with custom section # 24239
|
||||||
|
|
||||||
|
Using common defaults will reduce errors and maintenance.
|
||||||
|
Only the very small or inexistent custom section need periodic maintenance
|
||||||
|
when the structure of the component changes. Do not edit defaults.
|
||||||
|
|
||||||
|
commit b81a4976701606d1406ff56b91f13331e5f35860
|
||||||
|
Author: Yann Droneaud <ydroneaud@mandriva.com>
|
||||||
|
Date: Tue Nov 17 10:34:41 2009 +0100
|
||||||
|
|
||||||
|
xrandr: Remove test against RANDR_MAJOR/RANDR_MINOR
|
||||||
|
|
||||||
|
xrandr.c uses structures defined in <X11/extensions/Xrandr.h>
|
||||||
|
provided by 'libXrandr' package but tests structures availability
|
||||||
|
through RANDR_MAJOR/RANDR_MINOR defined in <X11/extensions/randr.h>
|
||||||
|
provided by 'randrproto' package.
|
||||||
|
|
||||||
|
Sometimes they are not in sync so it's safer to rely on checks made
|
||||||
|
by configure script through pkg-config.
|
||||||
|
|
||||||
|
In my test case, XRRPanning structure is not defined in Xrandr.h,
|
||||||
|
RANDR_MAJOR is 1 and RANDR_MINOR 2 but xrandr.c try to use it anyway.
|
||||||
|
(for the record, XRRPanning was added in libXrandr-1.2.91).
|
||||||
|
|
||||||
|
Signed-off-by: Yann Droneaud <ydroneaud@mandriva.com>
|
||||||
|
Reviewed-by: Rémi Cardona <remi@gentoo.org>
|
||||||
|
|
||||||
|
commit b84560759141ed52b8779c184184f888e9be8b2f
|
||||||
|
Author: Éric Piel <eric.piel@tremplin-utc.net>
|
||||||
|
Date: Mon Oct 26 14:11:02 2009 +0100
|
||||||
|
|
||||||
|
xrandr: do not segfault when "--scale" or "--transform" have no output
|
||||||
|
|
||||||
|
"xrandr --scale 2x2" segfaults, because the --scale (and --transform)
|
||||||
|
options do not check for an existing output.
|
||||||
|
|
||||||
|
Make sure there is an output specified (like every other options).
|
||||||
|
|
||||||
|
Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
|
||||||
|
Signed-off-by: Matthias Hopf <mhopf@suse.de>
|
||||||
|
|
||||||
|
commit 34829957441a10f6b6e31141aa1018f7a72aeaf9
|
||||||
|
Author: Éric Piel <eric.piel@tremplin-utc.net>
|
||||||
|
Date: Mon Oct 26 13:57:10 2009 +0100
|
||||||
|
|
||||||
|
xrandr: make --query really the default option
|
||||||
|
|
||||||
|
The manpage states that "--query" is the default action when nothing
|
||||||
|
specific is requested. However, some options such as "-display" or
|
||||||
|
"--screen" lead to do nothing by default. This makes sure that unless
|
||||||
|
something specific is requested, query is done.
|
||||||
|
|
||||||
|
This also restores the behaviour of --q1 to the same one as the old
|
||||||
|
xrandr: also display the info on rotation and reflection by default.
|
||||||
|
|
||||||
|
Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
|
||||||
|
Signed-off-by: Matthias Hopf <mhopf@suse.de>
|
||||||
|
|
||||||
|
commit 07bf47f32b1f4c256e32b5b47ab52ef55605370a
|
||||||
|
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||||
|
Date: Wed Oct 21 12:47:21 2009 -0700
|
||||||
|
|
||||||
|
This is not a GNU project, so declare it foreign.
|
||||||
|
|
||||||
|
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
|
||||||
|
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
|
||||||
|
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
|
||||||
|
> > was quite annoying to work around since 'autoreconf -fvi' replaces
|
||||||
|
> > it and git wants to commit it. Should these files even be in git?
|
||||||
|
> > Can I nuke them for the betterment of humanity and since they get
|
||||||
|
> > created by autoreconf anyways?
|
||||||
|
>
|
||||||
|
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
|
||||||
|
|
||||||
|
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
|
||||||
|
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
|
||||||
|
of the INSTALL file. It is also part of the 24206 solution.
|
||||||
|
|
||||||
|
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||||
|
|
||||||
|
commit 8d2702cae3b6a78cfd8d480dfb8209091917af2a
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||||
|
Date: Thu Oct 1 14:54:29 2009 -0700
|
||||||
|
|
||||||
|
Add README with pointers to mailing lists, bugzilla, & git
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||||
|
|
||||||
commit 5da0cb3533aa829588b2e6d715d511691fa1e45f
|
commit 5da0cb3533aa829588b2e6d715d511691fa1e45f
|
||||||
Author: Matthias Hopf <mhopf@suse.de>
|
Author: Matthias Hopf <mhopf@suse.de>
|
||||||
Date: Thu Sep 10 13:18:35 2009 +0200
|
Date: Thu Sep 10 13:18:35 2009 +0200
|
||||||
|
|
@ -298,7 +576,7 @@ Date: Mon Dec 1 21:45:47 2008 +0100
|
||||||
Fix build outside of the source dir
|
Fix build outside of the source dir
|
||||||
|
|
||||||
commit 63ba316bcbe8ad61ba63d9fe62c82e7d56dcc399
|
commit 63ba316bcbe8ad61ba63d9fe62c82e7d56dcc399
|
||||||
Merge: a813c4d... 1b95e32...
|
Merge: a813c4d 1b95e32
|
||||||
Author: Julien Cristau <jcristau@debian.org>
|
Author: Julien Cristau <jcristau@debian.org>
|
||||||
Date: Mon Dec 1 21:33:35 2008 +0100
|
Date: Mon Dec 1 21:33:35 2008 +0100
|
||||||
|
|
||||||
|
|
@ -776,7 +1054,7 @@ Date: Sun Feb 18 21:27:55 2007 -0800
|
||||||
Update version number to 1.2.0 for release.
|
Update version number to 1.2.0 for release.
|
||||||
|
|
||||||
commit 13cef2baa884039e96f5dfd9245bb949aed99448
|
commit 13cef2baa884039e96f5dfd9245bb949aed99448
|
||||||
Merge: 065f09c... a175972...
|
Merge: 065f09c a175972
|
||||||
Author: Keith Packard <keithp@neko.keithp.com>
|
Author: Keith Packard <keithp@neko.keithp.com>
|
||||||
Date: Sun Feb 18 21:26:50 2007 -0800
|
Date: Sun Feb 18 21:26:50 2007 -0800
|
||||||
|
|
||||||
|
|
@ -818,7 +1096,7 @@ Date: Sat Feb 10 16:14:58 2007 -0800
|
||||||
Display set of available CRTCs per output in --verbose mode.
|
Display set of available CRTCs per output in --verbose mode.
|
||||||
|
|
||||||
commit 067cafb5cda0aa6e34773e888fd469ff657760c2
|
commit 067cafb5cda0aa6e34773e888fd469ff657760c2
|
||||||
Merge: 7c25c24... b0a00df...
|
Merge: 7c25c24 b0a00df
|
||||||
Author: Keith Packard <keithp@guitar.keithp.com>
|
Author: Keith Packard <keithp@guitar.keithp.com>
|
||||||
Date: Wed Jan 31 15:25:35 2007 -0800
|
Date: Wed Jan 31 15:25:35 2007 -0800
|
||||||
|
|
||||||
|
|
@ -977,7 +1255,7 @@ Date: Tue Dec 19 16:27:46 2006 -0800
|
||||||
Actually respect the --fb option
|
Actually respect the --fb option
|
||||||
|
|
||||||
commit 7b32611632ab08b6a123db5df1c2b919b3a12104
|
commit 7b32611632ab08b6a123db5df1c2b919b3a12104
|
||||||
Merge: a0df3aa... 4bb1a9c...
|
Merge: a0df3aa 4bb1a9c
|
||||||
Author: Keith Packard <keithp@guitar.keithp.com>
|
Author: Keith Packard <keithp@guitar.keithp.com>
|
||||||
Date: Tue Dec 19 15:58:38 2006 -0800
|
Date: Tue Dec 19 15:58:38 2006 -0800
|
||||||
|
|
||||||
|
|
@ -990,7 +1268,7 @@ Date: Tue Dec 19 15:58:21 2006 -0800
|
||||||
Correct format for sscanf to double variable "dpi"
|
Correct format for sscanf to double variable "dpi"
|
||||||
|
|
||||||
commit 4bb1a9cd6f9cc3ed61d7913528afa3f573092833
|
commit 4bb1a9cd6f9cc3ed61d7913528afa3f573092833
|
||||||
Merge: b6c0382... 6ef400f...
|
Merge: b6c0382 6ef400f
|
||||||
Author: Keith Packard <keithp@bouzouki.jf.intel.com>
|
Author: Keith Packard <keithp@bouzouki.jf.intel.com>
|
||||||
Date: Wed Dec 13 11:36:36 2006 -0800
|
Date: Wed Dec 13 11:36:36 2006 -0800
|
||||||
|
|
||||||
|
|
|
||||||
291
xrandr/INSTALL
291
xrandr/INSTALL
|
|
@ -0,0 +1,291 @@
|
||||||
|
Installation Instructions
|
||||||
|
*************************
|
||||||
|
|
||||||
|
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||||
|
2006, 2007, 2008 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
This file is free documentation; the Free Software Foundation gives
|
||||||
|
unlimited permission to copy, distribute and modify it.
|
||||||
|
|
||||||
|
Basic Installation
|
||||||
|
==================
|
||||||
|
|
||||||
|
Briefly, the shell commands `./configure; make; make install' should
|
||||||
|
configure, build, and install this package. The following
|
||||||
|
more-detailed instructions are generic; see the `README' file for
|
||||||
|
instructions specific to this package.
|
||||||
|
|
||||||
|
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 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.
|
||||||
|
|
||||||
|
Running `configure' might take a while. 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.
|
||||||
|
|
||||||
|
6. Often, you can also type `make uninstall' to remove the installed
|
||||||
|
files again.
|
||||||
|
|
||||||
|
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=c99 CFLAGS=-g 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 can use 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 `..'.
|
||||||
|
|
||||||
|
With a non-GNU `make', it is safer 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.
|
||||||
|
|
||||||
|
On MacOS X 10.5 and later systems, you can create libraries and
|
||||||
|
executables that work on multiple system types--known as "fat" or
|
||||||
|
"universal" binaries--by specifying multiple `-arch' options to the
|
||||||
|
compiler but only a single `-arch' option to the preprocessor. Like
|
||||||
|
this:
|
||||||
|
|
||||||
|
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||||
|
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||||
|
CPP="gcc -E" CXXCPP="g++ -E"
|
||||||
|
|
||||||
|
This is not guaranteed to produce working output in all cases, you
|
||||||
|
may have to build one architecture at a time and combine the results
|
||||||
|
using the `lipo' tool if you have problems.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
Particular systems
|
||||||
|
==================
|
||||||
|
|
||||||
|
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
||||||
|
CC is not installed, it is recommended to use the following options in
|
||||||
|
order to use an ANSI C compiler:
|
||||||
|
|
||||||
|
./configure CC="cc -Ae"
|
||||||
|
|
||||||
|
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||||
|
|
||||||
|
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
||||||
|
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
||||||
|
a workaround. If GNU CC is not installed, it is therefore recommended
|
||||||
|
to try
|
||||||
|
|
||||||
|
./configure CC="cc"
|
||||||
|
|
||||||
|
and if that doesn't work, try
|
||||||
|
|
||||||
|
./configure CC="cc -nodtk"
|
||||||
|
|
||||||
|
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).
|
||||||
|
|
||||||
|
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
|
||||||
|
an Autoconf bug. Until the bug is fixed you can use this workaround:
|
||||||
|
|
||||||
|
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||||
|
|
||||||
|
`configure' Invocation
|
||||||
|
======================
|
||||||
|
|
||||||
|
`configure' recognizes the following options to control how it
|
||||||
|
operates.
|
||||||
|
|
||||||
|
`--help'
|
||||||
|
`-h'
|
||||||
|
Print a summary of all of the options to `configure', and exit.
|
||||||
|
|
||||||
|
`--help=short'
|
||||||
|
`--help=recursive'
|
||||||
|
Print a summary of the options unique to this package's
|
||||||
|
`configure', and exit. The `short' variant lists options used
|
||||||
|
only in the top level, while the `recursive' variant lists options
|
||||||
|
also present in any nested packages.
|
||||||
|
|
||||||
|
`--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.
|
||||||
|
|
||||||
|
`--prefix=DIR'
|
||||||
|
Use DIR as the installation prefix. *Note Installation Names::
|
||||||
|
for more details, including other options available for fine-tuning
|
||||||
|
the installation locations.
|
||||||
|
|
||||||
|
`--no-create'
|
||||||
|
`-n'
|
||||||
|
Run the configure checks, but stop before creating any output
|
||||||
|
files.
|
||||||
|
|
||||||
|
`configure' also accepts some other, not widely useful, options. Run
|
||||||
|
`configure --help' for more details.
|
||||||
|
|
||||||
|
|
@ -30,7 +30,7 @@ xkeystone: keystone.5c
|
||||||
clean-local:
|
clean-local:
|
||||||
rm -f xkeystone
|
rm -f xkeystone
|
||||||
|
|
||||||
AM_CFLAGS = $(XRANDR_CFLAGS)
|
AM_CFLAGS = $(XRANDR_CFLAGS) $(CWARNFLAGS)
|
||||||
xrandr_LDADD = $(XRANDR_LIBS)
|
xrandr_LDADD = $(XRANDR_LIBS)
|
||||||
|
|
||||||
xrandr_SOURCES = \
|
xrandr_SOURCES = \
|
||||||
|
|
@ -44,6 +44,7 @@ appmandir = $(APP_MAN_DIR)
|
||||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||||
|
|
||||||
EXTRA_DIST = $(appman_PRE) xrandr_test.pl keystone.5c
|
EXTRA_DIST = $(appman_PRE) xrandr_test.pl keystone.5c
|
||||||
|
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||||
CLEANFILES = $(appman_DATA)
|
CLEANFILES = $(appman_DATA)
|
||||||
|
|
||||||
SED = sed
|
SED = sed
|
||||||
|
|
@ -70,13 +71,14 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||||
.man.$(APP_MAN_SUFFIX):
|
.man.$(APP_MAN_SUFFIX):
|
||||||
sed $(MAN_SUBSTS) < $< > $@
|
sed $(MAN_SUBSTS) < $< > $@
|
||||||
|
|
||||||
EXTRA_DIST += ChangeLog
|
|
||||||
MAINTAINERCLEANFILES = ChangeLog
|
|
||||||
|
|
||||||
.PHONY: ChangeLog
|
.PHONY: ChangeLog INSTALL
|
||||||
|
|
||||||
|
INSTALL:
|
||||||
|
$(INSTALL_CMD)
|
||||||
|
|
||||||
ChangeLog:
|
ChangeLog:
|
||||||
$(CHANGELOG_CMD)
|
$(CHANGELOG_CMD)
|
||||||
|
|
||||||
dist-hook: ChangeLog
|
dist-hook: ChangeLog INSTALL
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||||
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
||||||
|
# Inc.
|
||||||
# This Makefile.in is free software; the Free Software Foundation
|
# This Makefile.in is free software; the Free Software Foundation
|
||||||
# gives unlimited permission to copy and/or distribute it,
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
# with or without modifications, as long as this notice is preserved.
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
@ -39,8 +40,9 @@
|
||||||
|
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
pkgdatadir = $(datadir)/@PACKAGE@
|
pkgdatadir = $(datadir)/@PACKAGE@
|
||||||
pkglibdir = $(libdir)/@PACKAGE@
|
|
||||||
pkgincludedir = $(includedir)/@PACKAGE@
|
pkgincludedir = $(includedir)/@PACKAGE@
|
||||||
|
pkglibdir = $(libdir)/@PACKAGE@
|
||||||
|
pkglibexecdir = $(libexecdir)/@PACKAGE@
|
||||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||||
install_sh_DATA = $(install_sh) -c -m 644
|
install_sh_DATA = $(install_sh) -c -m 644
|
||||||
install_sh_PROGRAM = $(install_sh) -c
|
install_sh_PROGRAM = $(install_sh) -c
|
||||||
|
|
@ -59,8 +61,8 @@ bin_PROGRAMS = xrandr$(EXEEXT)
|
||||||
subdir = .
|
subdir = .
|
||||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||||
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
$(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
|
||||||
config.guess config.sub depcomp install-sh missing
|
config.sub depcomp install-sh missing
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||||
|
|
@ -70,32 +72,58 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||||
mkinstalldirs = $(install_sh) -d
|
mkinstalldirs = $(install_sh) -d
|
||||||
CONFIG_HEADER = config.h
|
CONFIG_HEADER = config.h
|
||||||
CONFIG_CLEAN_FILES =
|
CONFIG_CLEAN_FILES =
|
||||||
|
CONFIG_CLEAN_VPATH_FILES =
|
||||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
|
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
|
||||||
"$(DESTDIR)$(appmandir)"
|
"$(DESTDIR)$(appmandir)"
|
||||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
||||||
PROGRAMS = $(bin_PROGRAMS)
|
PROGRAMS = $(bin_PROGRAMS)
|
||||||
am_xrandr_OBJECTS = xrandr.$(OBJEXT)
|
am_xrandr_OBJECTS = xrandr.$(OBJEXT)
|
||||||
xrandr_OBJECTS = $(am_xrandr_OBJECTS)
|
xrandr_OBJECTS = $(am_xrandr_OBJECTS)
|
||||||
am__DEPENDENCIES_1 =
|
am__DEPENDENCIES_1 =
|
||||||
xrandr_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
xrandr_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||||
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
|
|
||||||
SCRIPTS = $(bin_SCRIPTS)
|
|
||||||
DEFAULT_INCLUDES = -I.@am__isrc@
|
|
||||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
||||||
am__depfiles_maybe = depfiles
|
|
||||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
||||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
||||||
CCLD = $(CC)
|
|
||||||
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
||||||
SOURCES = $(xrandr_SOURCES)
|
|
||||||
DIST_SOURCES = $(xrandr_SOURCES)
|
|
||||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||||
am__vpath_adj = case $$p in \
|
am__vpath_adj = case $$p in \
|
||||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||||
*) f=$$p;; \
|
*) f=$$p;; \
|
||||||
esac;
|
esac;
|
||||||
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
|
||||||
appmanDATA_INSTALL = $(INSTALL_DATA)
|
am__install_max = 40
|
||||||
|
am__nobase_strip_setup = \
|
||||||
|
srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
|
||||||
|
am__nobase_strip = \
|
||||||
|
for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
|
||||||
|
am__nobase_list = $(am__nobase_strip_setup); \
|
||||||
|
for p in $$list; do echo "$$p $$p"; done | \
|
||||||
|
sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
|
||||||
|
$(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
|
||||||
|
if (++n[$$2] == $(am__install_max)) \
|
||||||
|
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
||||||
|
END { for (dir in files) print dir, files[dir] }'
|
||||||
|
am__base_list = \
|
||||||
|
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
||||||
|
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
||||||
|
SCRIPTS = $(bin_SCRIPTS)
|
||||||
|
DEFAULT_INCLUDES = -I.@am__isrc@
|
||||||
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||||
|
am__depfiles_maybe = depfiles
|
||||||
|
am__mv = mv -f
|
||||||
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||||
|
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||||
|
AM_V_CC = $(am__v_CC_$(V))
|
||||||
|
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
|
||||||
|
am__v_CC_0 = @echo " CC " $@;
|
||||||
|
AM_V_at = $(am__v_at_$(V))
|
||||||
|
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
|
||||||
|
am__v_at_0 = @
|
||||||
|
CCLD = $(CC)
|
||||||
|
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
|
AM_V_CCLD = $(am__v_CCLD_$(V))
|
||||||
|
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
|
||||||
|
am__v_CCLD_0 = @echo " CCLD " $@;
|
||||||
|
AM_V_GEN = $(am__v_GEN_$(V))
|
||||||
|
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
|
||||||
|
am__v_GEN_0 = @echo " GEN " $@;
|
||||||
|
SOURCES = $(xrandr_SOURCES)
|
||||||
|
DIST_SOURCES = $(xrandr_SOURCES)
|
||||||
DATA = $(appman_DATA)
|
DATA = $(appman_DATA)
|
||||||
ETAGS = etags
|
ETAGS = etags
|
||||||
CTAGS = ctags
|
CTAGS = ctags
|
||||||
|
|
@ -103,16 +131,18 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
distdir = $(PACKAGE)-$(VERSION)
|
distdir = $(PACKAGE)-$(VERSION)
|
||||||
top_distdir = $(distdir)
|
top_distdir = $(distdir)
|
||||||
am__remove_distdir = \
|
am__remove_distdir = \
|
||||||
{ test ! -d $(distdir) \
|
{ test ! -d "$(distdir)" \
|
||||||
|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
|
|| { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
|
||||||
&& rm -fr $(distdir); }; }
|
&& rm -fr "$(distdir)"; }; }
|
||||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||||
GZIP_ENV = --best
|
GZIP_ENV = --best
|
||||||
distuninstallcheck_listfiles = find . -type f -print
|
distuninstallcheck_listfiles = find . -type f -print
|
||||||
|
distcleancheck_listfiles = find . -type f -print
|
||||||
ACLOCAL = @ACLOCAL@
|
ACLOCAL = @ACLOCAL@
|
||||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
APP_MAN_DIR = @APP_MAN_DIR@
|
APP_MAN_DIR = @APP_MAN_DIR@
|
||||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
|
|
@ -140,6 +170,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
GREP = @GREP@
|
GREP = @GREP@
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
|
|
@ -152,6 +183,19 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||||
LTLIBOBJS = @LTLIBOBJS@
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
MAINT = @MAINT@
|
MAINT = @MAINT@
|
||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
|
MAN_SUBSTS = \
|
||||||
|
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||||
|
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||||
|
-e 's|__xservername__|Xorg|g' \
|
||||||
|
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||||
|
-e 's|__projectroot__|$(prefix)|g' \
|
||||||
|
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
||||||
|
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||||
|
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
||||||
|
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||||
|
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||||
|
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||||
|
|
||||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
MKDIR_P = @MKDIR_P@
|
MKDIR_P = @MKDIR_P@
|
||||||
|
|
@ -161,13 +205,18 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
PACKAGE_NAME = @PACKAGE_NAME@
|
PACKAGE_NAME = @PACKAGE_NAME@
|
||||||
PACKAGE_STRING = @PACKAGE_STRING@
|
PACKAGE_STRING = @PACKAGE_STRING@
|
||||||
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||||
|
PACKAGE_URL = @PACKAGE_URL@
|
||||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
|
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||||
|
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||||
|
SED = sed
|
||||||
SET_MAKE = @SET_MAKE@
|
SET_MAKE = @SET_MAKE@
|
||||||
SHELL = @SHELL@
|
SHELL = @SHELL@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
|
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||||
XRANDR_CFLAGS = @XRANDR_CFLAGS@
|
XRANDR_CFLAGS = @XRANDR_CFLAGS@
|
||||||
XRANDR_LIBS = @XRANDR_LIBS@
|
XRANDR_LIBS = @XRANDR_LIBS@
|
||||||
abs_builddir = @abs_builddir@
|
abs_builddir = @abs_builddir@
|
||||||
|
|
@ -189,7 +238,6 @@ build_vendor = @build_vendor@
|
||||||
builddir = @builddir@
|
builddir = @builddir@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
datarootdir = @datarootdir@
|
datarootdir = @datarootdir@
|
||||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
|
||||||
docdir = @docdir@
|
docdir = @docdir@
|
||||||
dvidir = @dvidir@
|
dvidir = @dvidir@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
|
|
@ -222,7 +270,7 @@ top_build_prefix = @top_build_prefix@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
bin_SCRIPTS = xkeystone
|
bin_SCRIPTS = xkeystone
|
||||||
AM_CFLAGS = $(XRANDR_CFLAGS)
|
AM_CFLAGS = $(XRANDR_CFLAGS) $(CWARNFLAGS)
|
||||||
xrandr_LDADD = $(XRANDR_LIBS)
|
xrandr_LDADD = $(XRANDR_LIBS)
|
||||||
xrandr_SOURCES = \
|
xrandr_SOURCES = \
|
||||||
xrandr.c
|
xrandr.c
|
||||||
|
|
@ -232,28 +280,14 @@ appman_PRE = \
|
||||||
|
|
||||||
appmandir = $(APP_MAN_DIR)
|
appmandir = $(APP_MAN_DIR)
|
||||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||||
EXTRA_DIST = $(appman_PRE) xrandr_test.pl keystone.5c ChangeLog
|
EXTRA_DIST = $(appman_PRE) xrandr_test.pl keystone.5c
|
||||||
|
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||||
CLEANFILES = $(appman_DATA)
|
CLEANFILES = $(appman_DATA)
|
||||||
SED = sed
|
|
||||||
|
|
||||||
# Strings to replace in man pages
|
# Strings to replace in man pages
|
||||||
XORGRELSTRING = @PACKAGE_STRING@
|
XORGRELSTRING = @PACKAGE_STRING@
|
||||||
XORGMANNAME = X Version 11
|
XORGMANNAME = X Version 11
|
||||||
MAN_SUBSTS = \
|
|
||||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
|
||||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
|
||||||
-e 's|__xservername__|Xorg|g' \
|
|
||||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
|
||||||
-e 's|__projectroot__|$(prefix)|g' \
|
|
||||||
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
|
||||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
|
||||||
|
|
||||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||||
MAINTAINERCLEANFILES = ChangeLog
|
|
||||||
all: config.h
|
all: config.h
|
||||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||||
|
|
||||||
|
|
@ -265,15 +299,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||||
@for dep in $?; do \
|
@for dep in $?; do \
|
||||||
case '$(am__configure_deps)' in \
|
case '$(am__configure_deps)' in \
|
||||||
*$$dep*) \
|
*$$dep*) \
|
||||||
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
|
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
|
||||||
cd $(srcdir) && $(AUTOMAKE) --gnu \
|
$(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
|
||||||
&& exit 0; \
|
&& exit 0; \
|
||||||
exit 1;; \
|
exit 1;; \
|
||||||
esac; \
|
esac; \
|
||||||
done; \
|
done; \
|
||||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
|
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
|
||||||
cd $(top_srcdir) && \
|
$(am__cd) $(top_srcdir) && \
|
||||||
$(AUTOMAKE) --gnu Makefile
|
$(AUTOMAKE) --foreign Makefile
|
||||||
.PRECIOUS: Makefile
|
.PRECIOUS: Makefile
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||||
@case '$?' in \
|
@case '$?' in \
|
||||||
|
|
@ -289,9 +323,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
|
||||||
$(SHELL) ./config.status --recheck
|
$(SHELL) ./config.status --recheck
|
||||||
|
|
||||||
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
cd $(srcdir) && $(AUTOCONF)
|
$(am__cd) $(srcdir) && $(AUTOCONF)
|
||||||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||||
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
||||||
|
$(am__aclocal_m4_deps):
|
||||||
|
|
||||||
config.h: stamp-h1
|
config.h: stamp-h1
|
||||||
@if test ! -f $@; then \
|
@if test ! -f $@; then \
|
||||||
|
|
@ -303,7 +338,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
|
||||||
@rm -f stamp-h1
|
@rm -f stamp-h1
|
||||||
cd $(top_builddir) && $(SHELL) ./config.status config.h
|
cd $(top_builddir) && $(SHELL) ./config.status config.h
|
||||||
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
cd $(top_srcdir) && $(AUTOHEADER)
|
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
|
||||||
rm -f stamp-h1
|
rm -f stamp-h1
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
|
|
@ -312,48 +347,77 @@ distclean-hdr:
|
||||||
install-binPROGRAMS: $(bin_PROGRAMS)
|
install-binPROGRAMS: $(bin_PROGRAMS)
|
||||||
@$(NORMAL_INSTALL)
|
@$(NORMAL_INSTALL)
|
||||||
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
|
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
|
||||||
@list='$(bin_PROGRAMS)'; for p in $$list; do \
|
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
|
||||||
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
for p in $$list; do echo "$$p $$p"; done | \
|
||||||
if test -f $$p \
|
sed 's/$(EXEEXT)$$//' | \
|
||||||
; then \
|
while read p p1; do if test -f $$p; \
|
||||||
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
then echo "$$p"; echo "$$p"; else :; fi; \
|
||||||
echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
|
done | \
|
||||||
$(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
|
sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
|
||||||
else :; fi; \
|
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
|
||||||
done
|
sed 'N;N;N;s,\n, ,g' | \
|
||||||
|
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
|
||||||
|
{ d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
|
||||||
|
if ($$2 == $$4) files[d] = files[d] " " $$1; \
|
||||||
|
else { print "f", $$3 "/" $$4, $$1; } } \
|
||||||
|
END { for (d in files) print "f", d, files[d] }' | \
|
||||||
|
while read type dir files; do \
|
||||||
|
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
||||||
|
test -z "$$files" || { \
|
||||||
|
echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
|
||||||
|
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
|
||||||
|
} \
|
||||||
|
; done
|
||||||
|
|
||||||
uninstall-binPROGRAMS:
|
uninstall-binPROGRAMS:
|
||||||
@$(NORMAL_UNINSTALL)
|
@$(NORMAL_UNINSTALL)
|
||||||
@list='$(bin_PROGRAMS)'; for p in $$list; do \
|
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
|
||||||
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
files=`for p in $$list; do echo "$$p"; done | \
|
||||||
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
|
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
|
||||||
rm -f "$(DESTDIR)$(bindir)/$$f"; \
|
-e 's/$$/$(EXEEXT)/' `; \
|
||||||
done
|
test -n "$$list" || exit 0; \
|
||||||
|
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
|
||||||
|
cd "$(DESTDIR)$(bindir)" && rm -f $$files
|
||||||
|
|
||||||
clean-binPROGRAMS:
|
clean-binPROGRAMS:
|
||||||
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
|
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
|
||||||
xrandr$(EXEEXT): $(xrandr_OBJECTS) $(xrandr_DEPENDENCIES)
|
xrandr$(EXEEXT): $(xrandr_OBJECTS) $(xrandr_DEPENDENCIES)
|
||||||
@rm -f xrandr$(EXEEXT)
|
@rm -f xrandr$(EXEEXT)
|
||||||
$(LINK) $(xrandr_OBJECTS) $(xrandr_LDADD) $(LIBS)
|
$(AM_V_CCLD)$(LINK) $(xrandr_OBJECTS) $(xrandr_LDADD) $(LIBS)
|
||||||
install-binSCRIPTS: $(bin_SCRIPTS)
|
install-binSCRIPTS: $(bin_SCRIPTS)
|
||||||
@$(NORMAL_INSTALL)
|
@$(NORMAL_INSTALL)
|
||||||
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
|
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
|
||||||
@list='$(bin_SCRIPTS)'; for p in $$list; do \
|
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
|
||||||
|
for p in $$list; do \
|
||||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||||
if test -f $$d$$p; then \
|
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
|
||||||
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
|
done | \
|
||||||
echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
|
sed -e 'p;s,.*/,,;n' \
|
||||||
$(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
|
-e 'h;s|.*|.|' \
|
||||||
else :; fi; \
|
-e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
|
||||||
done
|
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
|
||||||
|
{ d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
|
||||||
|
if ($$2 == $$4) { files[d] = files[d] " " $$1; \
|
||||||
|
if (++n[d] == $(am__install_max)) { \
|
||||||
|
print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
|
||||||
|
else { print "f", d "/" $$4, $$1 } } \
|
||||||
|
END { for (d in files) print "f", d, files[d] }' | \
|
||||||
|
while read type dir files; do \
|
||||||
|
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
||||||
|
test -z "$$files" || { \
|
||||||
|
echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
|
||||||
|
$(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
|
||||||
|
} \
|
||||||
|
; done
|
||||||
|
|
||||||
uninstall-binSCRIPTS:
|
uninstall-binSCRIPTS:
|
||||||
@$(NORMAL_UNINSTALL)
|
@$(NORMAL_UNINSTALL)
|
||||||
@list='$(bin_SCRIPTS)'; for p in $$list; do \
|
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
|
||||||
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
|
files=`for p in $$list; do echo "$$p"; done | \
|
||||||
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
|
sed -e 's,.*/,,;$(transform)'`; \
|
||||||
rm -f "$(DESTDIR)$(bindir)/$$f"; \
|
test -n "$$list" || exit 0; \
|
||||||
done
|
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
|
||||||
|
cd "$(DESTDIR)$(bindir)" && rm -f $$files
|
||||||
|
|
||||||
mostlyclean-compile:
|
mostlyclean-compile:
|
||||||
-rm -f *.$(OBJEXT)
|
-rm -f *.$(OBJEXT)
|
||||||
|
|
@ -364,49 +428,54 @@ distclean-compile:
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrandr.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrandr.Po@am__quote@
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||||
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||||
|
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
||||||
|
|
||||||
.c.obj:
|
.c.obj:
|
||||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
||||||
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||||
|
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||||
install-appmanDATA: $(appman_DATA)
|
install-appmanDATA: $(appman_DATA)
|
||||||
@$(NORMAL_INSTALL)
|
@$(NORMAL_INSTALL)
|
||||||
test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
|
test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
|
||||||
@list='$(appman_DATA)'; for p in $$list; do \
|
@list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
|
||||||
|
for p in $$list; do \
|
||||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||||
f=$(am__strip_dir) \
|
echo "$$d$$p"; \
|
||||||
echo " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \
|
done | $(am__base_list) | \
|
||||||
$(appmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appmandir)/$$f"; \
|
while read files; do \
|
||||||
|
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \
|
||||||
|
$(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \
|
||||||
done
|
done
|
||||||
|
|
||||||
uninstall-appmanDATA:
|
uninstall-appmanDATA:
|
||||||
@$(NORMAL_UNINSTALL)
|
@$(NORMAL_UNINSTALL)
|
||||||
@list='$(appman_DATA)'; for p in $$list; do \
|
@list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
|
||||||
f=$(am__strip_dir) \
|
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||||
echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
|
test -n "$$files" || exit 0; \
|
||||||
rm -f "$(DESTDIR)$(appmandir)/$$f"; \
|
echo " ( cd '$(DESTDIR)$(appmandir)' && rm -f" $$files ")"; \
|
||||||
done
|
cd "$(DESTDIR)$(appmandir)" && rm -f $$files
|
||||||
|
|
||||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||||
unique=`for i in $$list; do \
|
unique=`for i in $$list; do \
|
||||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||||
done | \
|
done | \
|
||||||
$(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||||
mkid -fID $$unique
|
mkid -fID $$unique
|
||||||
tags: TAGS
|
tags: TAGS
|
||||||
|
|
||||||
TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
||||||
$(TAGS_FILES) $(LISP)
|
$(TAGS_FILES) $(LISP)
|
||||||
tags=; \
|
set x; \
|
||||||
here=`pwd`; \
|
here=`pwd`; \
|
||||||
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
|
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
|
||||||
unique=`for i in $$list; do \
|
unique=`for i in $$list; do \
|
||||||
|
|
@ -414,36 +483,41 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
||||||
done | \
|
done | \
|
||||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
shift; \
|
||||||
|
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
||||||
test -n "$$unique" || unique=$$empty_fix; \
|
test -n "$$unique" || unique=$$empty_fix; \
|
||||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
if test $$# -gt 0; then \
|
||||||
$$tags $$unique; \
|
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||||
|
"$$@" $$unique; \
|
||||||
|
else \
|
||||||
|
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||||
|
$$unique; \
|
||||||
|
fi; \
|
||||||
fi
|
fi
|
||||||
ctags: CTAGS
|
ctags: CTAGS
|
||||||
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
||||||
$(TAGS_FILES) $(LISP)
|
$(TAGS_FILES) $(LISP)
|
||||||
tags=; \
|
|
||||||
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
|
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
|
||||||
unique=`for i in $$list; do \
|
unique=`for i in $$list; do \
|
||||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||||
done | \
|
done | \
|
||||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||||
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
test -z "$(CTAGS_ARGS)$$unique" \
|
||||||
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
||||||
$$tags $$unique
|
$$unique
|
||||||
|
|
||||||
GTAGS:
|
GTAGS:
|
||||||
here=`$(am__cd) $(top_builddir) && pwd` \
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
||||||
&& cd $(top_srcdir) \
|
&& $(am__cd) $(top_srcdir) \
|
||||||
&& gtags -i $(GTAGS_ARGS) $$here
|
&& gtags -i $(GTAGS_ARGS) "$$here"
|
||||||
|
|
||||||
distclean-tags:
|
distclean-tags:
|
||||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||||
|
|
||||||
distdir: $(DISTFILES)
|
distdir: $(DISTFILES)
|
||||||
$(am__remove_distdir)
|
$(am__remove_distdir)
|
||||||
test -d $(distdir) || mkdir $(distdir)
|
test -d "$(distdir)" || mkdir "$(distdir)"
|
||||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||||
list='$(DISTFILES)'; \
|
list='$(DISTFILES)'; \
|
||||||
|
|
@ -459,24 +533,30 @@ distdir: $(DISTFILES)
|
||||||
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
||||||
if test -d $$d/$$file; then \
|
if test -d $$d/$$file; then \
|
||||||
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||||
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
if test -d "$(distdir)/$$file"; then \
|
||||||
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
||||||
fi; \
|
fi; \
|
||||||
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
||||||
|
cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
||||||
|
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
||||||
|
fi; \
|
||||||
|
cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
||||||
else \
|
else \
|
||||||
test -f $(distdir)/$$file \
|
test -f "$(distdir)/$$file" \
|
||||||
|| cp -p $$d/$$file $(distdir)/$$file \
|
|| cp -p $$d/$$file "$(distdir)/$$file" \
|
||||||
|| exit 1; \
|
|| exit 1; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
$(MAKE) $(AM_MAKEFLAGS) \
|
$(MAKE) $(AM_MAKEFLAGS) \
|
||||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||||
dist-hook
|
dist-hook
|
||||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
-test -n "$(am__skip_mode_fix)" \
|
||||||
|
|| find "$(distdir)" -type d ! -perm -755 \
|
||||||
|
-exec chmod u+rwx,go+rx {} \; -o \
|
||||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||||
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
||||||
|| chmod -R a+r $(distdir)
|
|| chmod -R a+r "$(distdir)"
|
||||||
dist-gzip: distdir
|
dist-gzip: distdir
|
||||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||||
$(am__remove_distdir)
|
$(am__remove_distdir)
|
||||||
|
|
@ -488,6 +568,10 @@ dist-lzma: distdir
|
||||||
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
|
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
|
||||||
$(am__remove_distdir)
|
$(am__remove_distdir)
|
||||||
|
|
||||||
|
dist-xz: distdir
|
||||||
|
tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
|
||||||
|
$(am__remove_distdir)
|
||||||
|
|
||||||
dist-tarZ: distdir
|
dist-tarZ: distdir
|
||||||
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
||||||
$(am__remove_distdir)
|
$(am__remove_distdir)
|
||||||
|
|
@ -512,15 +596,17 @@ dist dist-all: distdir
|
||||||
distcheck: dist
|
distcheck: dist
|
||||||
case '$(DIST_ARCHIVES)' in \
|
case '$(DIST_ARCHIVES)' in \
|
||||||
*.tar.gz*) \
|
*.tar.gz*) \
|
||||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
||||||
*.tar.bz2*) \
|
*.tar.bz2*) \
|
||||||
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||||
*.tar.lzma*) \
|
*.tar.lzma*) \
|
||||||
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
|
||||||
|
*.tar.xz*) \
|
||||||
|
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
||||||
*.tar.Z*) \
|
*.tar.Z*) \
|
||||||
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
||||||
*.shar.gz*) \
|
*.shar.gz*) \
|
||||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
|
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
||||||
*.zip*) \
|
*.zip*) \
|
||||||
unzip $(distdir).zip ;;\
|
unzip $(distdir).zip ;;\
|
||||||
esac
|
esac
|
||||||
|
|
@ -528,9 +614,11 @@ distcheck: dist
|
||||||
mkdir $(distdir)/_build
|
mkdir $(distdir)/_build
|
||||||
mkdir $(distdir)/_inst
|
mkdir $(distdir)/_inst
|
||||||
chmod a-w $(distdir)
|
chmod a-w $(distdir)
|
||||||
|
test -d $(distdir)/_build || exit 0; \
|
||||||
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
|
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
|
||||||
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
|
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
|
||||||
&& cd $(distdir)/_build \
|
&& am__cwd=`pwd` \
|
||||||
|
&& $(am__cd) $(distdir)/_build \
|
||||||
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
|
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
|
||||||
$(DISTCHECK_CONFIGURE_FLAGS) \
|
$(DISTCHECK_CONFIGURE_FLAGS) \
|
||||||
&& $(MAKE) $(AM_MAKEFLAGS) \
|
&& $(MAKE) $(AM_MAKEFLAGS) \
|
||||||
|
|
@ -552,13 +640,15 @@ distcheck: dist
|
||||||
&& rm -rf "$$dc_destdir" \
|
&& rm -rf "$$dc_destdir" \
|
||||||
&& $(MAKE) $(AM_MAKEFLAGS) dist \
|
&& $(MAKE) $(AM_MAKEFLAGS) dist \
|
||||||
&& rm -rf $(DIST_ARCHIVES) \
|
&& rm -rf $(DIST_ARCHIVES) \
|
||||||
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
|
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
|
||||||
|
&& cd "$$am__cwd" \
|
||||||
|
|| exit 1
|
||||||
$(am__remove_distdir)
|
$(am__remove_distdir)
|
||||||
@(echo "$(distdir) archives ready for distribution: "; \
|
@(echo "$(distdir) archives ready for distribution: "; \
|
||||||
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
|
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
|
||||||
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
|
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
|
||||||
distuninstallcheck:
|
distuninstallcheck:
|
||||||
@cd $(distuninstallcheck_dir) \
|
@$(am__cd) '$(distuninstallcheck_dir)' \
|
||||||
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|
||||||
|| { echo "ERROR: files left after uninstall:" ; \
|
|| { echo "ERROR: files left after uninstall:" ; \
|
||||||
if test -n "$(DESTDIR)"; then \
|
if test -n "$(DESTDIR)"; then \
|
||||||
|
|
@ -603,6 +693,7 @@ clean-generic:
|
||||||
|
|
||||||
distclean-generic:
|
distclean-generic:
|
||||||
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||||
|
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
||||||
|
|
||||||
maintainer-clean-generic:
|
maintainer-clean-generic:
|
||||||
@echo "This command is intended for maintainers to use"
|
@echo "This command is intended for maintainers to use"
|
||||||
|
|
@ -625,6 +716,8 @@ dvi-am:
|
||||||
|
|
||||||
html: html-am
|
html: html-am
|
||||||
|
|
||||||
|
html-am:
|
||||||
|
|
||||||
info: info-am
|
info: info-am
|
||||||
|
|
||||||
info-am:
|
info-am:
|
||||||
|
|
@ -633,18 +726,28 @@ install-data-am: install-appmanDATA
|
||||||
|
|
||||||
install-dvi: install-dvi-am
|
install-dvi: install-dvi-am
|
||||||
|
|
||||||
|
install-dvi-am:
|
||||||
|
|
||||||
install-exec-am: install-binPROGRAMS install-binSCRIPTS
|
install-exec-am: install-binPROGRAMS install-binSCRIPTS
|
||||||
|
|
||||||
install-html: install-html-am
|
install-html: install-html-am
|
||||||
|
|
||||||
|
install-html-am:
|
||||||
|
|
||||||
install-info: install-info-am
|
install-info: install-info-am
|
||||||
|
|
||||||
|
install-info-am:
|
||||||
|
|
||||||
install-man:
|
install-man:
|
||||||
|
|
||||||
install-pdf: install-pdf-am
|
install-pdf: install-pdf-am
|
||||||
|
|
||||||
|
install-pdf-am:
|
||||||
|
|
||||||
install-ps: install-ps-am
|
install-ps: install-ps-am
|
||||||
|
|
||||||
|
install-ps-am:
|
||||||
|
|
||||||
installcheck-am:
|
installcheck-am:
|
||||||
|
|
||||||
maintainer-clean: maintainer-clean-am
|
maintainer-clean: maintainer-clean-am
|
||||||
|
|
@ -669,21 +772,21 @@ ps-am:
|
||||||
uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||||
uninstall-binSCRIPTS
|
uninstall-binSCRIPTS
|
||||||
|
|
||||||
.MAKE: install-am install-strip
|
.MAKE: all install-am install-strip
|
||||||
|
|
||||||
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
||||||
clean-binPROGRAMS clean-generic clean-local ctags dist \
|
clean-binPROGRAMS clean-generic clean-local ctags dist \
|
||||||
dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
|
dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
|
||||||
dist-tarZ dist-zip distcheck distclean distclean-compile \
|
dist-tarZ dist-xz dist-zip distcheck distclean \
|
||||||
distclean-generic distclean-hdr distclean-tags distcleancheck \
|
distclean-compile distclean-generic distclean-hdr \
|
||||||
distdir distuninstallcheck dvi dvi-am html html-am info \
|
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||||
info-am install install-am install-appmanDATA \
|
dvi-am html html-am info info-am install install-am \
|
||||||
install-binPROGRAMS install-binSCRIPTS install-data \
|
install-appmanDATA install-binPROGRAMS install-binSCRIPTS \
|
||||||
install-data-am install-dvi install-dvi-am install-exec \
|
install-data install-data-am install-dvi install-dvi-am \
|
||||||
install-exec-am install-html install-html-am install-info \
|
install-exec install-exec-am install-html install-html-am \
|
||||||
install-info-am install-man install-pdf install-pdf-am \
|
install-info install-info-am install-man install-pdf \
|
||||||
install-ps install-ps-am install-strip installcheck \
|
install-pdf-am install-ps install-ps-am install-strip \
|
||||||
installcheck-am installdirs maintainer-clean \
|
installcheck installcheck-am installdirs maintainer-clean \
|
||||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||||
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
||||||
uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
|
uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||||
|
|
@ -700,12 +803,16 @@ clean-local:
|
||||||
.man.$(APP_MAN_SUFFIX):
|
.man.$(APP_MAN_SUFFIX):
|
||||||
sed $(MAN_SUBSTS) < $< > $@
|
sed $(MAN_SUBSTS) < $< > $@
|
||||||
|
|
||||||
.PHONY: ChangeLog
|
.PHONY: ChangeLog INSTALL
|
||||||
|
|
||||||
|
INSTALL:
|
||||||
|
$(INSTALL_CMD)
|
||||||
|
|
||||||
ChangeLog:
|
ChangeLog:
|
||||||
$(CHANGELOG_CMD)
|
$(CHANGELOG_CMD)
|
||||||
|
|
||||||
dist-hook: ChangeLog
|
dist-hook: ChangeLog INSTALL
|
||||||
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
.NOEXPORT:
|
.NOEXPORT:
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
xrandr - primitive command line interface to X11 Resize, Rotate, and Reflect
|
||||||
|
(RandR) extension
|
||||||
|
|
||||||
|
All questions regarding this software should be directed at the
|
||||||
|
Xorg mailing list:
|
||||||
|
|
||||||
|
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||||
|
|
||||||
|
Please submit bug reports to the Xorg bugzilla:
|
||||||
|
|
||||||
|
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||||
|
|
||||||
|
The master development code repository can be found at:
|
||||||
|
|
||||||
|
git://anongit.freedesktop.org/git/xorg/app/xrandr
|
||||||
|
|
||||||
|
http://cgit.freedesktop.org/xorg/app/xrandr
|
||||||
|
|
||||||
|
For patch submission instructions, see:
|
||||||
|
|
||||||
|
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||||
|
|
||||||
|
For more information on the git code manager, see:
|
||||||
|
|
||||||
|
http://wiki.x.org/wiki/GitPage
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,10 +1,10 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Attempt to guess a canonical system name.
|
# Attempt to guess a canonical system name.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
||||||
# Inc.
|
# Free Software Foundation, Inc.
|
||||||
|
|
||||||
timestamp='2006-07-02'
|
timestamp='2009-12-30'
|
||||||
|
|
||||||
# This file is free software; you can redistribute it and/or modify it
|
# This file is free software; you can redistribute it and/or modify it
|
||||||
# under the terms of the GNU General Public License as published by
|
# under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -27,16 +27,16 @@ timestamp='2006-07-02'
|
||||||
# the same distribution terms that you use for the rest of that program.
|
# the same distribution terms that you use for the rest of that program.
|
||||||
|
|
||||||
|
|
||||||
# Originally written by Per Bothner <per@bothner.com>.
|
# Originally written by Per Bothner. Please send patches (context
|
||||||
# Please send patches to <config-patches@gnu.org>. Submit a context
|
# diff format) to <config-patches@gnu.org> and include a ChangeLog
|
||||||
# diff and a properly formatted ChangeLog entry.
|
# entry.
|
||||||
#
|
#
|
||||||
# This script attempts to guess a canonical system name similar to
|
# This script attempts to guess a canonical system name similar to
|
||||||
# config.sub. If it succeeds, it prints the system name on stdout, and
|
# config.sub. If it succeeds, it prints the system name on stdout, and
|
||||||
# exits with 0. Otherwise, it exits with 1.
|
# exits with 0. Otherwise, it exits with 1.
|
||||||
#
|
#
|
||||||
# The plan is that this can be called by configure scripts if you
|
# You can get the latest version of this script from:
|
||||||
# don't specify an explicit build system type.
|
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
||||||
|
|
||||||
me=`echo "$0" | sed -e 's,.*/,,'`
|
me=`echo "$0" | sed -e 's,.*/,,'`
|
||||||
|
|
||||||
|
|
@ -56,8 +56,9 @@ version="\
|
||||||
GNU config.guess ($timestamp)
|
GNU config.guess ($timestamp)
|
||||||
|
|
||||||
Originally written by Per Bothner.
|
Originally written by Per Bothner.
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
||||||
Free Software Foundation, Inc.
|
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
|
||||||
|
Software Foundation, Inc.
|
||||||
|
|
||||||
This is free software; see the source for copying conditions. There is NO
|
This is free software; see the source for copying conditions. There is NO
|
||||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||||
|
|
@ -139,16 +140,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
||||||
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
||||||
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
||||||
|
|
||||||
case "${UNAME_MACHINE}" in
|
|
||||||
i?86)
|
|
||||||
test -z "$VENDOR" && VENDOR=pc
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
test -z "$VENDOR" && VENDOR=unknown
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
|
|
||||||
|
|
||||||
# Note: order is significant - the case branches are not exclusive.
|
# Note: order is significant - the case branches are not exclusive.
|
||||||
|
|
||||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
|
|
@ -171,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
arm*) machine=arm-unknown ;;
|
arm*) machine=arm-unknown ;;
|
||||||
sh3el) machine=shl-unknown ;;
|
sh3el) machine=shl-unknown ;;
|
||||||
sh3eb) machine=sh-unknown ;;
|
sh3eb) machine=sh-unknown ;;
|
||||||
|
sh5el) machine=sh5le-unknown ;;
|
||||||
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
||||||
esac
|
esac
|
||||||
# The Operating System including object format, if it has switched
|
# The Operating System including object format, if it has switched
|
||||||
|
|
@ -179,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
||||||
eval $set_cc_for_build
|
eval $set_cc_for_build
|
||||||
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||||
| grep __ELF__ >/dev/null
|
| grep -q __ELF__
|
||||||
then
|
then
|
||||||
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
|
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
|
||||||
# Return netbsd for either. FIX?
|
# Return netbsd for either. FIX?
|
||||||
|
|
@ -333,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
case `/usr/bin/uname -p` in
|
case `/usr/bin/uname -p` in
|
||||||
sparc) echo sparc-icl-nx7; exit ;;
|
sparc) echo sparc-icl-nx7; exit ;;
|
||||||
esac ;;
|
esac ;;
|
||||||
|
s390x:SunOS:*:*)
|
||||||
|
echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||||
|
exit ;;
|
||||||
sun4H:SunOS:5.*:*)
|
sun4H:SunOS:5.*:*)
|
||||||
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||||
exit ;;
|
exit ;;
|
||||||
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
||||||
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||||
exit ;;
|
exit ;;
|
||||||
i86pc:SunOS:5.*:*)
|
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
|
||||||
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
echo i386-pc-auroraux${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
|
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
||||||
|
eval $set_cc_for_build
|
||||||
|
SUN_ARCH="i386"
|
||||||
|
# If there is a compiler, see if it is configured for 64-bit objects.
|
||||||
|
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
|
||||||
|
# This test works for both compilers.
|
||||||
|
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||||
|
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
|
||||||
|
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||||
|
grep IS_64BIT_ARCH >/dev/null
|
||||||
|
then
|
||||||
|
SUN_ARCH="x86_64"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||||
exit ;;
|
exit ;;
|
||||||
sun4*:SunOS:6*:*)
|
sun4*:SunOS:6*:*)
|
||||||
# According to config.sub, this is the proper way to canonicalize
|
# According to config.sub, this is the proper way to canonicalize
|
||||||
|
|
@ -541,7 +552,7 @@ EOF
|
||||||
echo rs6000-ibm-aix3.2
|
echo rs6000-ibm-aix3.2
|
||||||
fi
|
fi
|
||||||
exit ;;
|
exit ;;
|
||||||
*:AIX:*:[45])
|
*:AIX:*:[456])
|
||||||
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
||||||
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
||||||
IBM_ARCH=rs6000
|
IBM_ARCH=rs6000
|
||||||
|
|
@ -649,7 +660,7 @@ EOF
|
||||||
# => hppa64-hp-hpux11.23
|
# => hppa64-hp-hpux11.23
|
||||||
|
|
||||||
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
|
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
|
||||||
grep __LP64__ >/dev/null
|
grep -q __LP64__
|
||||||
then
|
then
|
||||||
HP_ARCH="hppa2.0w"
|
HP_ARCH="hppa2.0w"
|
||||||
else
|
else
|
||||||
|
|
@ -790,7 +801,7 @@ EOF
|
||||||
i*:CYGWIN*:*)
|
i*:CYGWIN*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-cygwin
|
echo ${UNAME_MACHINE}-pc-cygwin
|
||||||
exit ;;
|
exit ;;
|
||||||
i*:MINGW*:*)
|
*:MINGW*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-mingw32
|
echo ${UNAME_MACHINE}-pc-mingw32
|
||||||
exit ;;
|
exit ;;
|
||||||
i*:windows32*:*)
|
i*:windows32*:*)
|
||||||
|
|
@ -800,15 +811,24 @@ EOF
|
||||||
i*:PW*:*)
|
i*:PW*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-pw32
|
echo ${UNAME_MACHINE}-pc-pw32
|
||||||
exit ;;
|
exit ;;
|
||||||
x86:Interix*:[3456]*)
|
*:Interix*:*)
|
||||||
echo i586-pc-interix${UNAME_RELEASE}
|
case ${UNAME_MACHINE} in
|
||||||
exit ;;
|
x86)
|
||||||
EM64T:Interix*:[3456]*)
|
echo i586-pc-interix${UNAME_RELEASE}
|
||||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
exit ;;
|
||||||
exit ;;
|
authenticamd | genuineintel | EM64T)
|
||||||
|
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
|
IA64)
|
||||||
|
echo ia64-unknown-interix${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
|
esac ;;
|
||||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||||
echo i${UNAME_MACHINE}-pc-mks
|
echo i${UNAME_MACHINE}-pc-mks
|
||||||
exit ;;
|
exit ;;
|
||||||
|
8664:Windows_NT:*)
|
||||||
|
echo x86_64-pc-mks
|
||||||
|
exit ;;
|
||||||
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
|
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
|
||||||
# How do we know it's Interix rather than the generic POSIX subsystem?
|
# How do we know it's Interix rather than the generic POSIX subsystem?
|
||||||
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
|
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
|
||||||
|
|
@ -838,8 +858,29 @@ EOF
|
||||||
i*86:Minix:*:*)
|
i*86:Minix:*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-minix
|
echo ${UNAME_MACHINE}-pc-minix
|
||||||
exit ;;
|
exit ;;
|
||||||
|
alpha:Linux:*:*)
|
||||||
|
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
||||||
|
EV5) UNAME_MACHINE=alphaev5 ;;
|
||||||
|
EV56) UNAME_MACHINE=alphaev56 ;;
|
||||||
|
PCA56) UNAME_MACHINE=alphapca56 ;;
|
||||||
|
PCA57) UNAME_MACHINE=alphapca56 ;;
|
||||||
|
EV6) UNAME_MACHINE=alphaev6 ;;
|
||||||
|
EV67) UNAME_MACHINE=alphaev67 ;;
|
||||||
|
EV68*) UNAME_MACHINE=alphaev68 ;;
|
||||||
|
esac
|
||||||
|
objdump --private-headers /bin/sh | grep -q ld.so.1
|
||||||
|
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
||||||
|
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
||||||
|
exit ;;
|
||||||
arm*:Linux:*:*)
|
arm*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
eval $set_cc_for_build
|
||||||
|
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||||
|
| grep -q __ARM_EABI__
|
||||||
|
then
|
||||||
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
|
else
|
||||||
|
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
||||||
|
fi
|
||||||
exit ;;
|
exit ;;
|
||||||
avr32*:Linux:*:*)
|
avr32*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
|
|
@ -851,178 +892,91 @@ EOF
|
||||||
echo crisv32-axis-linux-gnu
|
echo crisv32-axis-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
frv:Linux:*:*)
|
frv:Linux:*:*)
|
||||||
echo frv-${VENDOR}-linux-gnu
|
echo frv-unknown-linux-gnu
|
||||||
|
exit ;;
|
||||||
|
i*86:Linux:*:*)
|
||||||
|
LIBC=gnu
|
||||||
|
eval $set_cc_for_build
|
||||||
|
sed 's/^ //' << EOF >$dummy.c
|
||||||
|
#ifdef __dietlibc__
|
||||||
|
LIBC=dietlibc
|
||||||
|
#endif
|
||||||
|
EOF
|
||||||
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
|
||||||
|
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||||
exit ;;
|
exit ;;
|
||||||
ia64:Linux:*:*)
|
ia64:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
m32r*:Linux:*:*)
|
m32r*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
m68*:Linux:*:*)
|
m68*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
mips:Linux:*:*)
|
mips:Linux:*:* | mips64:Linux:*:*)
|
||||||
eval $set_cc_for_build
|
eval $set_cc_for_build
|
||||||
sed 's/^ //' << EOF >$dummy.c
|
sed 's/^ //' << EOF >$dummy.c
|
||||||
#undef CPU
|
#undef CPU
|
||||||
#undef mips
|
#undef ${UNAME_MACHINE}
|
||||||
#undef mipsel
|
#undef ${UNAME_MACHINE}el
|
||||||
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
||||||
CPU=mipsel
|
CPU=${UNAME_MACHINE}el
|
||||||
#else
|
#else
|
||||||
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
||||||
CPU=mips
|
CPU=${UNAME_MACHINE}
|
||||||
#else
|
#else
|
||||||
CPU=
|
CPU=
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
EOF
|
EOF
|
||||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
|
||||||
/^CPU/{
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||||
s: ::g
|
|
||||||
p
|
|
||||||
}'`"
|
|
||||||
test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
|
|
||||||
;;
|
|
||||||
mips64:Linux:*:*)
|
|
||||||
eval $set_cc_for_build
|
|
||||||
sed 's/^ //' << EOF >$dummy.c
|
|
||||||
#undef CPU
|
|
||||||
#undef mips64
|
|
||||||
#undef mips64el
|
|
||||||
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
|
||||||
CPU=mips64el
|
|
||||||
#else
|
|
||||||
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
|
||||||
CPU=mips64
|
|
||||||
#else
|
|
||||||
CPU=
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
EOF
|
|
||||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
||||||
/^CPU/{
|
|
||||||
s: ::g
|
|
||||||
p
|
|
||||||
}'`"
|
|
||||||
test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
|
|
||||||
;;
|
;;
|
||||||
or32:Linux:*:*)
|
or32:Linux:*:*)
|
||||||
echo or32-${VENDOR}-linux-gnu
|
echo or32-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
ppc:Linux:*:*)
|
padre:Linux:*:*)
|
||||||
echo powerpc-${VENDOR}-linux-gnu
|
echo sparc-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
ppc64:Linux:*:*)
|
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
||||||
echo powerpc64-${VENDOR}-linux-gnu
|
echo hppa64-unknown-linux-gnu
|
||||||
exit ;;
|
|
||||||
alpha:Linux:*:*)
|
|
||||||
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
||||||
EV5) UNAME_MACHINE=alphaev5 ;;
|
|
||||||
EV56) UNAME_MACHINE=alphaev56 ;;
|
|
||||||
PCA56) UNAME_MACHINE=alphapca56 ;;
|
|
||||||
PCA57) UNAME_MACHINE=alphapca56 ;;
|
|
||||||
EV6) UNAME_MACHINE=alphaev6 ;;
|
|
||||||
EV67) UNAME_MACHINE=alphaev67 ;;
|
|
||||||
EV68*) UNAME_MACHINE=alphaev68 ;;
|
|
||||||
esac
|
|
||||||
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
|
||||||
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
||||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
|
|
||||||
exit ;;
|
exit ;;
|
||||||
parisc:Linux:*:* | hppa:Linux:*:*)
|
parisc:Linux:*:* | hppa:Linux:*:*)
|
||||||
# Look for CPU level
|
# Look for CPU level
|
||||||
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
||||||
PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
|
PA7*) echo hppa1.1-unknown-linux-gnu ;;
|
||||||
PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
|
PA8*) echo hppa2.0-unknown-linux-gnu ;;
|
||||||
*) echo hppa-${VENDOR}-linux-gnu ;;
|
*) echo hppa-unknown-linux-gnu ;;
|
||||||
esac
|
esac
|
||||||
exit ;;
|
exit ;;
|
||||||
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
ppc64:Linux:*:*)
|
||||||
echo hppa64-${VENDOR}-linux-gnu
|
echo powerpc64-unknown-linux-gnu
|
||||||
|
exit ;;
|
||||||
|
ppc:Linux:*:*)
|
||||||
|
echo powerpc-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
s390:Linux:*:* | s390x:Linux:*:*)
|
s390:Linux:*:* | s390x:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-ibm-linux
|
echo ${UNAME_MACHINE}-ibm-linux
|
||||||
exit ;;
|
exit ;;
|
||||||
sh64*:Linux:*:*)
|
sh64*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
sh*:Linux:*:*)
|
sh*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
vax:Linux:*:*)
|
vax:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-dec-linux-gnu
|
echo ${UNAME_MACHINE}-dec-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
x86_64:Linux:*:*)
|
x86_64:Linux:*:*)
|
||||||
echo x86_64-${VENDOR}-linux-gnu
|
echo x86_64-unknown-linux-gnu
|
||||||
|
exit ;;
|
||||||
|
xtensa*:Linux:*:*)
|
||||||
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
i*86:Linux:*:*)
|
|
||||||
# The BFD linker knows what the default object file format is, so
|
|
||||||
# first see if it will tell us. cd to the root directory to prevent
|
|
||||||
# problems with other programs or directories called `ld' in the path.
|
|
||||||
# Set LC_ALL=C to ensure ld outputs messages in English.
|
|
||||||
ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
|
|
||||||
| sed -ne '/supported targets:/!d
|
|
||||||
s/[ ][ ]*/ /g
|
|
||||||
s/.*supported targets: *//
|
|
||||||
s/ .*//
|
|
||||||
p'`
|
|
||||||
case "$ld_supported_targets" in
|
|
||||||
elf32-i386)
|
|
||||||
TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
|
|
||||||
;;
|
|
||||||
a.out-i386-linux)
|
|
||||||
echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
|
|
||||||
exit ;;
|
|
||||||
coff-i386)
|
|
||||||
echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
|
|
||||||
exit ;;
|
|
||||||
"")
|
|
||||||
# Either a pre-BFD a.out linker (linux-gnuoldld) or
|
|
||||||
# one that does not give us useful --help.
|
|
||||||
echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
|
|
||||||
exit ;;
|
|
||||||
esac
|
|
||||||
# Determine whether the default compiler is a.out or elf
|
|
||||||
eval $set_cc_for_build
|
|
||||||
sed 's/^ //' << EOF >$dummy.c
|
|
||||||
#include <features.h>
|
|
||||||
#ifdef __ELF__
|
|
||||||
# ifdef __GLIBC__
|
|
||||||
# if __GLIBC__ >= 2
|
|
||||||
LIBC=gnu
|
|
||||||
# else
|
|
||||||
LIBC=gnulibc1
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
LIBC=gnulibc1
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
|
||||||
LIBC=gnu
|
|
||||||
#else
|
|
||||||
LIBC=gnuaout
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#ifdef __dietlibc__
|
|
||||||
LIBC=dietlibc
|
|
||||||
#endif
|
|
||||||
EOF
|
|
||||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
||||||
/^LIBC/{
|
|
||||||
s: ::g
|
|
||||||
p
|
|
||||||
}'`"
|
|
||||||
test x"${LIBC}" != x && {
|
|
||||||
echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
|
|
||||||
exit
|
|
||||||
}
|
|
||||||
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
|
|
||||||
;;
|
|
||||||
i*86:DYNIX/ptx:4*:*)
|
i*86:DYNIX/ptx:4*:*)
|
||||||
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
||||||
# earlier versions are messed up and put the nodename in both
|
# earlier versions are messed up and put the nodename in both
|
||||||
|
|
@ -1051,7 +1005,7 @@ EOF
|
||||||
i*86:syllable:*:*)
|
i*86:syllable:*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-syllable
|
echo ${UNAME_MACHINE}-pc-syllable
|
||||||
exit ;;
|
exit ;;
|
||||||
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
|
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
|
||||||
echo i386-unknown-lynxos${UNAME_RELEASE}
|
echo i386-unknown-lynxos${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
i*86:*DOS:*:*)
|
i*86:*DOS:*:*)
|
||||||
|
|
@ -1095,8 +1049,11 @@ EOF
|
||||||
pc:*:*:*)
|
pc:*:*:*)
|
||||||
# Left here for compatibility:
|
# Left here for compatibility:
|
||||||
# uname -m prints for DJGPP always 'pc', but it prints nothing about
|
# uname -m prints for DJGPP always 'pc', but it prints nothing about
|
||||||
# the processor, so we play safe by assuming i386.
|
# the processor, so we play safe by assuming i586.
|
||||||
echo i386-pc-msdosdjgpp
|
# Note: whatever this is, it MUST be the same as what config.sub
|
||||||
|
# prints for the "djgpp" host, or else GDB configury will decide that
|
||||||
|
# this is a cross-build.
|
||||||
|
echo i586-pc-msdosdjgpp
|
||||||
exit ;;
|
exit ;;
|
||||||
Intel:Mach:3*:*)
|
Intel:Mach:3*:*)
|
||||||
echo i386-pc-mach3
|
echo i386-pc-mach3
|
||||||
|
|
@ -1134,6 +1091,16 @@ EOF
|
||||||
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
|
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
|
||||||
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
||||||
&& { echo i486-ncr-sysv4; exit; } ;;
|
&& { echo i486-ncr-sysv4; exit; } ;;
|
||||||
|
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
|
||||||
|
OS_REL='.3'
|
||||||
|
test -r /etc/.relid \
|
||||||
|
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
|
||||||
|
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
||||||
|
&& { echo i486-ncr-sysv4.3${OS_REL}; exit; }
|
||||||
|
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
|
||||||
|
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; }
|
||||||
|
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
|
||||||
|
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
|
||||||
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
|
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
|
||||||
echo m68k-unknown-lynxos${UNAME_RELEASE}
|
echo m68k-unknown-lynxos${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
|
|
@ -1146,7 +1113,7 @@ EOF
|
||||||
rs6000:LynxOS:2.*:*)
|
rs6000:LynxOS:2.*:*)
|
||||||
echo rs6000-unknown-lynxos${UNAME_RELEASE}
|
echo rs6000-unknown-lynxos${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
|
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
|
||||||
echo powerpc-unknown-lynxos${UNAME_RELEASE}
|
echo powerpc-unknown-lynxos${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
SM[BE]S:UNIX_SV:*:*)
|
SM[BE]S:UNIX_SV:*:*)
|
||||||
|
|
@ -1209,6 +1176,9 @@ EOF
|
||||||
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
||||||
echo i586-pc-beos
|
echo i586-pc-beos
|
||||||
exit ;;
|
exit ;;
|
||||||
|
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
|
||||||
|
echo i586-pc-haiku
|
||||||
|
exit ;;
|
||||||
SX-4:SUPER-UX:*:*)
|
SX-4:SUPER-UX:*:*)
|
||||||
echo sx4-nec-superux${UNAME_RELEASE}
|
echo sx4-nec-superux${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
|
|
@ -1218,6 +1188,15 @@ EOF
|
||||||
SX-6:SUPER-UX:*:*)
|
SX-6:SUPER-UX:*:*)
|
||||||
echo sx6-nec-superux${UNAME_RELEASE}
|
echo sx6-nec-superux${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
|
SX-7:SUPER-UX:*:*)
|
||||||
|
echo sx7-nec-superux${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
|
SX-8:SUPER-UX:*:*)
|
||||||
|
echo sx8-nec-superux${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
|
SX-8R:SUPER-UX:*:*)
|
||||||
|
echo sx8r-nec-superux${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
Power*:Rhapsody:*:*)
|
Power*:Rhapsody:*:*)
|
||||||
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
|
|
@ -1227,6 +1206,16 @@ EOF
|
||||||
*:Darwin:*:*)
|
*:Darwin:*:*)
|
||||||
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
||||||
case $UNAME_PROCESSOR in
|
case $UNAME_PROCESSOR in
|
||||||
|
i386)
|
||||||
|
eval $set_cc_for_build
|
||||||
|
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||||
|
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
|
||||||
|
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||||
|
grep IS_64BIT_ARCH >/dev/null
|
||||||
|
then
|
||||||
|
UNAME_PROCESSOR="x86_64"
|
||||||
|
fi
|
||||||
|
fi ;;
|
||||||
unknown) UNAME_PROCESSOR=powerpc ;;
|
unknown) UNAME_PROCESSOR=powerpc ;;
|
||||||
esac
|
esac
|
||||||
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
||||||
|
|
@ -1308,6 +1297,9 @@ EOF
|
||||||
i*86:rdos:*:*)
|
i*86:rdos:*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-rdos
|
echo ${UNAME_MACHINE}-pc-rdos
|
||||||
exit ;;
|
exit ;;
|
||||||
|
i*86:AROS:*:*)
|
||||||
|
echo ${UNAME_MACHINE}-pc-aros
|
||||||
|
exit ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||||
|
|
@ -1468,9 +1460,9 @@ This script, last modified $timestamp, has failed to recognize
|
||||||
the operating system you are using. It is advised that you
|
the operating system you are using. It is advised that you
|
||||||
download the most up to date version of the config scripts from
|
download the most up to date version of the config scripts from
|
||||||
|
|
||||||
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
|
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
||||||
and
|
and
|
||||||
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
|
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
|
||||||
|
|
||||||
If the version you run ($0) is already up to date, please
|
If the version you run ($0) is already up to date, please
|
||||||
send the following data and any information you think might be
|
send the following data and any information you think might be
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,9 @@
|
||||||
/* Define to the one symbol short name of this package. */
|
/* Define to the one symbol short name of this package. */
|
||||||
#undef PACKAGE_TARNAME
|
#undef PACKAGE_TARNAME
|
||||||
|
|
||||||
|
/* Define to the home page for this package. */
|
||||||
|
#undef PACKAGE_URL
|
||||||
|
|
||||||
/* Define to the version of this package. */
|
/* Define to the version of this package. */
|
||||||
#undef PACKAGE_VERSION
|
#undef PACKAGE_VERSION
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Configuration validation subroutine script.
|
# Configuration validation subroutine script.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
||||||
# Inc.
|
# Free Software Foundation, Inc.
|
||||||
|
|
||||||
timestamp='2006-09-20'
|
timestamp='2010-01-22'
|
||||||
|
|
||||||
# This file is (in principle) common to ALL GNU software.
|
# This file is (in principle) common to ALL GNU software.
|
||||||
# The presence of a machine in this file suggests that SOME GNU software
|
# The presence of a machine in this file suggests that SOME GNU software
|
||||||
|
|
@ -32,13 +32,16 @@ timestamp='2006-09-20'
|
||||||
|
|
||||||
|
|
||||||
# Please send patches to <config-patches@gnu.org>. Submit a context
|
# Please send patches to <config-patches@gnu.org>. Submit a context
|
||||||
# diff and a properly formatted ChangeLog entry.
|
# diff and a properly formatted GNU ChangeLog entry.
|
||||||
#
|
#
|
||||||
# Configuration subroutine to validate and canonicalize a configuration type.
|
# Configuration subroutine to validate and canonicalize a configuration type.
|
||||||
# Supply the specified configuration type as an argument.
|
# Supply the specified configuration type as an argument.
|
||||||
# If it is invalid, we print an error message on stderr and exit with code 1.
|
# If it is invalid, we print an error message on stderr and exit with code 1.
|
||||||
# Otherwise, we print the canonical config type on stdout and succeed.
|
# Otherwise, we print the canonical config type on stdout and succeed.
|
||||||
|
|
||||||
|
# You can get the latest version of this script from:
|
||||||
|
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
|
||||||
|
|
||||||
# This file is supposed to be the same for all GNU packages
|
# This file is supposed to be the same for all GNU packages
|
||||||
# and recognize all the CPU types, system types and aliases
|
# and recognize all the CPU types, system types and aliases
|
||||||
# that are meaningful with *any* GNU software.
|
# that are meaningful with *any* GNU software.
|
||||||
|
|
@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
|
||||||
version="\
|
version="\
|
||||||
GNU config.sub ($timestamp)
|
GNU config.sub ($timestamp)
|
||||||
|
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
||||||
Free Software Foundation, Inc.
|
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
|
||||||
|
Software Foundation, Inc.
|
||||||
|
|
||||||
This is free software; see the source for copying conditions. There is NO
|
This is free software; see the source for copying conditions. There is NO
|
||||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||||
|
|
@ -122,6 +126,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||||
case $maybe_os in
|
case $maybe_os in
|
||||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
||||||
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
||||||
|
kopensolaris*-gnu* | \
|
||||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||||
os=-$maybe_os
|
os=-$maybe_os
|
||||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||||
|
|
@ -148,10 +153,13 @@ case $os in
|
||||||
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
||||||
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
||||||
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
||||||
-apple | -axis | -knuth | -cray)
|
-apple | -axis | -knuth | -cray | -microblaze)
|
||||||
os=
|
os=
|
||||||
basic_machine=$1
|
basic_machine=$1
|
||||||
;;
|
;;
|
||||||
|
-bluegene*)
|
||||||
|
os=-cnk
|
||||||
|
;;
|
||||||
-sim | -cisco | -oki | -wec | -winbond)
|
-sim | -cisco | -oki | -wec | -winbond)
|
||||||
os=
|
os=
|
||||||
basic_machine=$1
|
basic_machine=$1
|
||||||
|
|
@ -245,17 +253,20 @@ case $basic_machine in
|
||||||
| bfin \
|
| bfin \
|
||||||
| c4x | clipper \
|
| c4x | clipper \
|
||||||
| d10v | d30v | dlx | dsp16xx \
|
| d10v | d30v | dlx | dsp16xx \
|
||||||
| fr30 | frv \
|
| fido | fr30 | frv \
|
||||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||||
| i370 | i860 | i960 | ia64 \
|
| i370 | i860 | i960 | ia64 \
|
||||||
| ip2k | iq2000 \
|
| ip2k | iq2000 \
|
||||||
|
| lm32 \
|
||||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||||
| maxq | mb | microblaze | mcore \
|
| maxq | mb | microblaze | mcore | mep | metag \
|
||||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||||
| mips16 \
|
| mips16 \
|
||||||
| mips64 | mips64el \
|
| mips64 | mips64el \
|
||||||
| mips64vr | mips64vrel \
|
| mips64octeon | mips64octeonel \
|
||||||
| mips64orion | mips64orionel \
|
| mips64orion | mips64orionel \
|
||||||
|
| mips64r5900 | mips64r5900el \
|
||||||
|
| mips64vr | mips64vrel \
|
||||||
| mips64vr4100 | mips64vr4100el \
|
| mips64vr4100 | mips64vr4100el \
|
||||||
| mips64vr4300 | mips64vr4300el \
|
| mips64vr4300 | mips64vr4300el \
|
||||||
| mips64vr5000 | mips64vr5000el \
|
| mips64vr5000 | mips64vr5000el \
|
||||||
|
|
@ -268,6 +279,7 @@ case $basic_machine in
|
||||||
| mipsisa64sr71k | mipsisa64sr71kel \
|
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||||
| mipstx39 | mipstx39el \
|
| mipstx39 | mipstx39el \
|
||||||
| mn10200 | mn10300 \
|
| mn10200 | mn10300 \
|
||||||
|
| moxie \
|
||||||
| mt \
|
| mt \
|
||||||
| msp430 \
|
| msp430 \
|
||||||
| nios | nios2 \
|
| nios | nios2 \
|
||||||
|
|
@ -276,20 +288,22 @@ case $basic_machine in
|
||||||
| pdp10 | pdp11 | pj | pjl \
|
| pdp10 | pdp11 | pj | pjl \
|
||||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||||
| pyramid \
|
| pyramid \
|
||||||
|
| rx \
|
||||||
| score \
|
| score \
|
||||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||||
| sh64 | sh64le \
|
| sh64 | sh64le \
|
||||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||||
| spu | strongarm \
|
| spu | strongarm \
|
||||||
| tahoe | thumb | tic4x | tic80 | tron \
|
| tahoe | thumb | tic4x | tic80 | tron \
|
||||||
|
| ubicom32 \
|
||||||
| v850 | v850e \
|
| v850 | v850e \
|
||||||
| we32k \
|
| we32k \
|
||||||
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||||
| z8k)
|
| z8k | z80)
|
||||||
basic_machine=$basic_machine-unknown
|
basic_machine=$basic_machine-unknown
|
||||||
;;
|
;;
|
||||||
m6811 | m68hc11 | m6812 | m68hc12)
|
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
|
||||||
# Motorola 68HC11/12.
|
# Motorola 68HC11/12.
|
||||||
basic_machine=$basic_machine-unknown
|
basic_machine=$basic_machine-unknown
|
||||||
os=-none
|
os=-none
|
||||||
|
|
@ -324,19 +338,22 @@ case $basic_machine in
|
||||||
| clipper-* | craynv-* | cydra-* \
|
| clipper-* | craynv-* | cydra-* \
|
||||||
| d10v-* | d30v-* | dlx-* \
|
| d10v-* | d30v-* | dlx-* \
|
||||||
| elxsi-* \
|
| elxsi-* \
|
||||||
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
|
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
||||||
| h8300-* | h8500-* \
|
| h8300-* | h8500-* \
|
||||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||||
| i*86-* | i860-* | i960-* | ia64-* \
|
| i*86-* | i860-* | i960-* | ia64-* \
|
||||||
| ip2k-* | iq2000-* \
|
| ip2k-* | iq2000-* \
|
||||||
|
| lm32-* \
|
||||||
| m32c-* | m32r-* | m32rle-* \
|
| m32c-* | m32r-* | m32rle-* \
|
||||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||||
| m88110-* | m88k-* | maxq-* | mcore-* \
|
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
|
||||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||||
| mips16-* \
|
| mips16-* \
|
||||||
| mips64-* | mips64el-* \
|
| mips64-* | mips64el-* \
|
||||||
| mips64vr-* | mips64vrel-* \
|
| mips64octeon-* | mips64octeonel-* \
|
||||||
| mips64orion-* | mips64orionel-* \
|
| mips64orion-* | mips64orionel-* \
|
||||||
|
| mips64r5900-* | mips64r5900el-* \
|
||||||
|
| mips64vr-* | mips64vrel-* \
|
||||||
| mips64vr4100-* | mips64vr4100el-* \
|
| mips64vr4100-* | mips64vr4100el-* \
|
||||||
| mips64vr4300-* | mips64vr4300el-* \
|
| mips64vr4300-* | mips64vr4300el-* \
|
||||||
| mips64vr5000-* | mips64vr5000el-* \
|
| mips64vr5000-* | mips64vr5000el-* \
|
||||||
|
|
@ -357,21 +374,27 @@ case $basic_machine in
|
||||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||||
| pyramid-* \
|
| pyramid-* \
|
||||||
| romp-* | rs6000-* \
|
| romp-* | rs6000-* | rx-* \
|
||||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||||
| sparclite-* \
|
| sparclite-* \
|
||||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
||||||
| tahoe-* | thumb-* \
|
| tahoe-* | thumb-* \
|
||||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||||
|
| tile-* | tilegx-* \
|
||||||
| tron-* \
|
| tron-* \
|
||||||
|
| ubicom32-* \
|
||||||
| v850-* | v850e-* | vax-* \
|
| v850-* | v850e-* | vax-* \
|
||||||
| we32k-* \
|
| we32k-* \
|
||||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||||
| xstormy16-* | xtensa-* \
|
| xstormy16-* | xtensa*-* \
|
||||||
| ymp-* \
|
| ymp-* \
|
||||||
| z8k-*)
|
| z8k-* | z80-*)
|
||||||
|
;;
|
||||||
|
# Recognize the basic CPU types without company name, with glob match.
|
||||||
|
xtensa*)
|
||||||
|
basic_machine=$basic_machine-unknown
|
||||||
;;
|
;;
|
||||||
# Recognize the various machine names and aliases which stand
|
# Recognize the various machine names and aliases which stand
|
||||||
# for a CPU type and a company and sometimes even an OS.
|
# for a CPU type and a company and sometimes even an OS.
|
||||||
|
|
@ -435,6 +458,10 @@ case $basic_machine in
|
||||||
basic_machine=m68k-apollo
|
basic_machine=m68k-apollo
|
||||||
os=-bsd
|
os=-bsd
|
||||||
;;
|
;;
|
||||||
|
aros)
|
||||||
|
basic_machine=i386-pc
|
||||||
|
os=-aros
|
||||||
|
;;
|
||||||
aux)
|
aux)
|
||||||
basic_machine=m68k-apple
|
basic_machine=m68k-apple
|
||||||
os=-aux
|
os=-aux
|
||||||
|
|
@ -443,10 +470,26 @@ case $basic_machine in
|
||||||
basic_machine=ns32k-sequent
|
basic_machine=ns32k-sequent
|
||||||
os=-dynix
|
os=-dynix
|
||||||
;;
|
;;
|
||||||
|
blackfin)
|
||||||
|
basic_machine=bfin-unknown
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
|
blackfin-*)
|
||||||
|
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
|
bluegene*)
|
||||||
|
basic_machine=powerpc-ibm
|
||||||
|
os=-cnk
|
||||||
|
;;
|
||||||
c90)
|
c90)
|
||||||
basic_machine=c90-cray
|
basic_machine=c90-cray
|
||||||
os=-unicos
|
os=-unicos
|
||||||
;;
|
;;
|
||||||
|
cegcc)
|
||||||
|
basic_machine=arm-unknown
|
||||||
|
os=-cegcc
|
||||||
|
;;
|
||||||
convex-c1)
|
convex-c1)
|
||||||
basic_machine=c1-convex
|
basic_machine=c1-convex
|
||||||
os=-bsd
|
os=-bsd
|
||||||
|
|
@ -475,8 +518,8 @@ case $basic_machine in
|
||||||
basic_machine=craynv-cray
|
basic_machine=craynv-cray
|
||||||
os=-unicosmp
|
os=-unicosmp
|
||||||
;;
|
;;
|
||||||
cr16c)
|
cr16)
|
||||||
basic_machine=cr16c-unknown
|
basic_machine=cr16-unknown
|
||||||
os=-elf
|
os=-elf
|
||||||
;;
|
;;
|
||||||
crds | unos)
|
crds | unos)
|
||||||
|
|
@ -514,6 +557,10 @@ case $basic_machine in
|
||||||
basic_machine=m88k-motorola
|
basic_machine=m88k-motorola
|
||||||
os=-sysv3
|
os=-sysv3
|
||||||
;;
|
;;
|
||||||
|
dicos)
|
||||||
|
basic_machine=i686-pc
|
||||||
|
os=-dicos
|
||||||
|
;;
|
||||||
djgpp)
|
djgpp)
|
||||||
basic_machine=i586-pc
|
basic_machine=i586-pc
|
||||||
os=-msdosdjgpp
|
os=-msdosdjgpp
|
||||||
|
|
@ -668,6 +715,14 @@ case $basic_machine in
|
||||||
basic_machine=m68k-isi
|
basic_machine=m68k-isi
|
||||||
os=-sysv
|
os=-sysv
|
||||||
;;
|
;;
|
||||||
|
m68knommu)
|
||||||
|
basic_machine=m68k-unknown
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
|
m68knommu-*)
|
||||||
|
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
m88k-omron*)
|
m88k-omron*)
|
||||||
basic_machine=m88k-omron
|
basic_machine=m88k-omron
|
||||||
;;
|
;;
|
||||||
|
|
@ -679,10 +734,17 @@ case $basic_machine in
|
||||||
basic_machine=ns32k-utek
|
basic_machine=ns32k-utek
|
||||||
os=-sysv
|
os=-sysv
|
||||||
;;
|
;;
|
||||||
|
microblaze)
|
||||||
|
basic_machine=microblaze-xilinx
|
||||||
|
;;
|
||||||
mingw32)
|
mingw32)
|
||||||
basic_machine=i386-pc
|
basic_machine=i386-pc
|
||||||
os=-mingw32
|
os=-mingw32
|
||||||
;;
|
;;
|
||||||
|
mingw32ce)
|
||||||
|
basic_machine=arm-unknown
|
||||||
|
os=-mingw32ce
|
||||||
|
;;
|
||||||
miniframe)
|
miniframe)
|
||||||
basic_machine=m68000-convergent
|
basic_machine=m68000-convergent
|
||||||
;;
|
;;
|
||||||
|
|
@ -809,6 +871,14 @@ case $basic_machine in
|
||||||
basic_machine=i860-intel
|
basic_machine=i860-intel
|
||||||
os=-osf
|
os=-osf
|
||||||
;;
|
;;
|
||||||
|
parisc)
|
||||||
|
basic_machine=hppa-unknown
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
|
parisc-*)
|
||||||
|
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
pbd)
|
pbd)
|
||||||
basic_machine=sparc-tti
|
basic_machine=sparc-tti
|
||||||
;;
|
;;
|
||||||
|
|
@ -925,6 +995,9 @@ case $basic_machine in
|
||||||
basic_machine=sh-hitachi
|
basic_machine=sh-hitachi
|
||||||
os=-hms
|
os=-hms
|
||||||
;;
|
;;
|
||||||
|
sh5el)
|
||||||
|
basic_machine=sh5le-unknown
|
||||||
|
;;
|
||||||
sh64)
|
sh64)
|
||||||
basic_machine=sh64-unknown
|
basic_machine=sh64-unknown
|
||||||
;;
|
;;
|
||||||
|
|
@ -1014,6 +1087,15 @@ case $basic_machine in
|
||||||
basic_machine=tic6x-unknown
|
basic_machine=tic6x-unknown
|
||||||
os=-coff
|
os=-coff
|
||||||
;;
|
;;
|
||||||
|
# This must be matched before tile*.
|
||||||
|
tilegx*)
|
||||||
|
basic_machine=tilegx-unknown
|
||||||
|
os=-linux-gnu
|
||||||
|
;;
|
||||||
|
tile*)
|
||||||
|
basic_machine=tile-unknown
|
||||||
|
os=-linux-gnu
|
||||||
|
;;
|
||||||
tx39)
|
tx39)
|
||||||
basic_machine=mipstx39-unknown
|
basic_machine=mipstx39-unknown
|
||||||
;;
|
;;
|
||||||
|
|
@ -1089,6 +1171,10 @@ case $basic_machine in
|
||||||
basic_machine=z8k-unknown
|
basic_machine=z8k-unknown
|
||||||
os=-sim
|
os=-sim
|
||||||
;;
|
;;
|
||||||
|
z80-*-coff)
|
||||||
|
basic_machine=z80-unknown
|
||||||
|
os=-sim
|
||||||
|
;;
|
||||||
none)
|
none)
|
||||||
basic_machine=none-none
|
basic_machine=none-none
|
||||||
os=-none
|
os=-none
|
||||||
|
|
@ -1127,7 +1213,7 @@ case $basic_machine in
|
||||||
we32k)
|
we32k)
|
||||||
basic_machine=we32k-att
|
basic_machine=we32k-att
|
||||||
;;
|
;;
|
||||||
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||||
basic_machine=sh-unknown
|
basic_machine=sh-unknown
|
||||||
;;
|
;;
|
||||||
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
||||||
|
|
@ -1177,6 +1263,9 @@ case $os in
|
||||||
# First match some system type aliases
|
# First match some system type aliases
|
||||||
# that might get confused with valid system types.
|
# that might get confused with valid system types.
|
||||||
# -solaris* is a basic system type, with this one exception.
|
# -solaris* is a basic system type, with this one exception.
|
||||||
|
-auroraux)
|
||||||
|
os=-auroraux
|
||||||
|
;;
|
||||||
-solaris1 | -solaris1.*)
|
-solaris1 | -solaris1.*)
|
||||||
os=`echo $os | sed -e 's|solaris1|sunos4|'`
|
os=`echo $os | sed -e 's|solaris1|sunos4|'`
|
||||||
;;
|
;;
|
||||||
|
|
@ -1197,10 +1286,11 @@ case $os in
|
||||||
# Each alternative MUST END IN A *, to match a version number.
|
# Each alternative MUST END IN A *, to match a version number.
|
||||||
# -sysv* is not here because it comes later, after sysvr4.
|
# -sysv* is not here because it comes later, after sysvr4.
|
||||||
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
||||||
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
|
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
||||||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
|
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
||||||
|
| -sym* | -kopensolaris* \
|
||||||
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
||||||
| -aos* \
|
| -aos* | -aros* \
|
||||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||||
|
|
@ -1209,7 +1299,7 @@ case $os in
|
||||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||||
| -chorusos* | -chorusrdb* \
|
| -chorusos* | -chorusrdb* | -cegcc* \
|
||||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||||
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
||||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
| -uxpv* | -beos* | -mpeix* | -udk* \
|
||||||
|
|
@ -1219,7 +1309,7 @@ case $os in
|
||||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||||
| -skyos* | -haiku* | -rdos* | -toppers*)
|
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
|
||||||
# Remember, each alternative MUST END IN *, to match a version number.
|
# Remember, each alternative MUST END IN *, to match a version number.
|
||||||
;;
|
;;
|
||||||
-qnx*)
|
-qnx*)
|
||||||
|
|
@ -1349,6 +1439,11 @@ case $os in
|
||||||
-zvmoe)
|
-zvmoe)
|
||||||
os=-zvmoe
|
os=-zvmoe
|
||||||
;;
|
;;
|
||||||
|
-dicos*)
|
||||||
|
os=-dicos
|
||||||
|
;;
|
||||||
|
-nacl*)
|
||||||
|
;;
|
||||||
-none)
|
-none)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
@ -1414,6 +1509,9 @@ case $basic_machine in
|
||||||
m68*-cisco)
|
m68*-cisco)
|
||||||
os=-aout
|
os=-aout
|
||||||
;;
|
;;
|
||||||
|
mep-*)
|
||||||
|
os=-elf
|
||||||
|
;;
|
||||||
mips*-cisco)
|
mips*-cisco)
|
||||||
os=-elf
|
os=-elf
|
||||||
;;
|
;;
|
||||||
|
|
@ -1543,7 +1641,7 @@ case $basic_machine in
|
||||||
-sunos*)
|
-sunos*)
|
||||||
vendor=sun
|
vendor=sun
|
||||||
;;
|
;;
|
||||||
-aix*)
|
-cnk*|-aix*)
|
||||||
vendor=ibm
|
vendor=ibm
|
||||||
;;
|
;;
|
||||||
-beos*)
|
-beos*)
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -21,29 +21,26 @@ dnl
|
||||||
dnl Process this file with autoconf to create configure.
|
dnl Process this file with autoconf to create configure.
|
||||||
|
|
||||||
AC_PREREQ([2.57])
|
AC_PREREQ([2.57])
|
||||||
AC_INIT(xrandr,[1.3.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrandr)
|
AC_INIT(xrandr,[1.3.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrandr)
|
||||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
|
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
|
m4_ifndef([XORG_MACROS_VERSION],
|
||||||
XORG_MACROS_VERSION(1.2)
|
[m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
|
||||||
|
XORG_MACROS_VERSION(1.4)
|
||||||
|
XORG_DEFAULT_OPTIONS
|
||||||
|
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
XORG_CWARNFLAGS
|
|
||||||
|
|
||||||
AC_CHECK_LIB(m,floor)
|
AC_CHECK_LIB(m,floor)
|
||||||
# Checks for pkg-config packages
|
# Checks for pkg-config packages
|
||||||
PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3 xrender x11)
|
PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3 xrender x11)
|
||||||
XRANDR_CFLAGS="$CWARNFLAGS $XRANDR_CFLAGS"
|
|
||||||
AC_SUBST(XRANDR_CFLAGS)
|
AC_SUBST(XRANDR_CFLAGS)
|
||||||
AC_SUBST(XRANDR_LIBS)
|
AC_SUBST(XRANDR_LIBS)
|
||||||
|
|
||||||
XORG_MANPAGE_SECTIONS
|
|
||||||
XORG_RELEASE_VERSION
|
|
||||||
XORG_CHANGELOG
|
|
||||||
|
|
||||||
AC_OUTPUT([Makefile])
|
AC_OUTPUT([Makefile])
|
||||||
|
|
|
||||||
116
xrandr/depcomp
116
xrandr/depcomp
|
|
@ -1,10 +1,10 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# depcomp - compile a program generating dependencies as side-effects
|
# depcomp - compile a program generating dependencies as side-effects
|
||||||
|
|
||||||
scriptversion=2006-10-15.18
|
scriptversion=2009-04-28.21; # UTC
|
||||||
|
|
||||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
|
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
|
||||||
# Foundation, Inc.
|
# Software Foundation, Inc.
|
||||||
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -17,9 +17,7 @@ scriptversion=2006-10-15.18
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
||||||
# 02110-1301, USA.
|
|
||||||
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
# As a special exception to the GNU General Public License, if you
|
||||||
# distribute this file as part of a program that contains a
|
# distribute this file as part of a program that contains a
|
||||||
|
|
@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
|
||||||
depmode=dashmstdout
|
depmode=dashmstdout
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cygpath_u="cygpath -u -f -"
|
||||||
|
if test "$depmode" = msvcmsys; then
|
||||||
|
# This is just like msvisualcpp but w/o cygpath translation.
|
||||||
|
# Just convert the backslash-escaped backslashes to single forward
|
||||||
|
# slashes to satisfy depend.m4
|
||||||
|
cygpath_u="sed s,\\\\\\\\,/,g"
|
||||||
|
depmode=msvisualcpp
|
||||||
|
fi
|
||||||
|
|
||||||
case "$depmode" in
|
case "$depmode" in
|
||||||
gcc3)
|
gcc3)
|
||||||
## gcc 3 implements dependency tracking that does exactly what
|
## gcc 3 implements dependency tracking that does exactly what
|
||||||
|
|
@ -192,14 +199,14 @@ sgi)
|
||||||
' < "$tmpdepfile" \
|
' < "$tmpdepfile" \
|
||||||
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
|
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
|
||||||
tr '
|
tr '
|
||||||
' ' ' >> $depfile
|
' ' ' >> "$depfile"
|
||||||
echo >> $depfile
|
echo >> "$depfile"
|
||||||
|
|
||||||
# The second pass generates a dummy entry for each header file.
|
# The second pass generates a dummy entry for each header file.
|
||||||
tr ' ' '
|
tr ' ' '
|
||||||
' < "$tmpdepfile" \
|
' < "$tmpdepfile" \
|
||||||
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
|
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
|
||||||
>> $depfile
|
>> "$depfile"
|
||||||
else
|
else
|
||||||
# The sourcefile does not contain any dependencies, so just
|
# The sourcefile does not contain any dependencies, so just
|
||||||
# store a dummy comment line, to avoid errors with the Makefile
|
# store a dummy comment line, to avoid errors with the Makefile
|
||||||
|
|
@ -215,34 +222,39 @@ aix)
|
||||||
# current directory. Also, the AIX compiler puts `$object:' at the
|
# current directory. Also, the AIX compiler puts `$object:' at the
|
||||||
# start of each line; $object doesn't have directory information.
|
# start of each line; $object doesn't have directory information.
|
||||||
# Version 6 uses the directory in both cases.
|
# Version 6 uses the directory in both cases.
|
||||||
stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
|
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
||||||
tmpdepfile="$stripped.u"
|
test "x$dir" = "x$object" && dir=
|
||||||
|
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
||||||
if test "$libtool" = yes; then
|
if test "$libtool" = yes; then
|
||||||
|
tmpdepfile1=$dir$base.u
|
||||||
|
tmpdepfile2=$base.u
|
||||||
|
tmpdepfile3=$dir.libs/$base.u
|
||||||
"$@" -Wc,-M
|
"$@" -Wc,-M
|
||||||
else
|
else
|
||||||
|
tmpdepfile1=$dir$base.u
|
||||||
|
tmpdepfile2=$dir$base.u
|
||||||
|
tmpdepfile3=$dir$base.u
|
||||||
"$@" -M
|
"$@" -M
|
||||||
fi
|
fi
|
||||||
stat=$?
|
stat=$?
|
||||||
|
|
||||||
if test -f "$tmpdepfile"; then :
|
|
||||||
else
|
|
||||||
stripped=`echo "$stripped" | sed 's,^.*/,,'`
|
|
||||||
tmpdepfile="$stripped.u"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test $stat -eq 0; then :
|
if test $stat -eq 0; then :
|
||||||
else
|
else
|
||||||
rm -f "$tmpdepfile"
|
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||||
exit $stat
|
exit $stat
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||||
|
do
|
||||||
|
test -f "$tmpdepfile" && break
|
||||||
|
done
|
||||||
if test -f "$tmpdepfile"; then
|
if test -f "$tmpdepfile"; then
|
||||||
outname="$stripped.o"
|
|
||||||
# Each line is of the form `foo.o: dependent.h'.
|
# Each line is of the form `foo.o: dependent.h'.
|
||||||
# Do two passes, one to just change these to
|
# Do two passes, one to just change these to
|
||||||
# `$object: dependent.h' and one to simply `dependent.h:'.
|
# `$object: dependent.h' and one to simply `dependent.h:'.
|
||||||
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
|
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
||||||
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
|
# That's a tab and a space in the [].
|
||||||
|
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
||||||
else
|
else
|
||||||
# The sourcefile does not contain any dependencies, so just
|
# The sourcefile does not contain any dependencies, so just
|
||||||
# store a dummy comment line, to avoid errors with the Makefile
|
# store a dummy comment line, to avoid errors with the Makefile
|
||||||
|
|
@ -323,7 +335,12 @@ hp2)
|
||||||
if test -f "$tmpdepfile"; then
|
if test -f "$tmpdepfile"; then
|
||||||
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
|
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
|
||||||
# Add `dependent.h:' lines.
|
# Add `dependent.h:' lines.
|
||||||
sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
|
sed -ne '2,${
|
||||||
|
s/^ *//
|
||||||
|
s/ \\*$//
|
||||||
|
s/$/:/
|
||||||
|
p
|
||||||
|
}' "$tmpdepfile" >> "$depfile"
|
||||||
else
|
else
|
||||||
echo "#dummy" > "$depfile"
|
echo "#dummy" > "$depfile"
|
||||||
fi
|
fi
|
||||||
|
|
@ -399,7 +416,7 @@ dashmstdout)
|
||||||
|
|
||||||
# Remove the call to Libtool.
|
# Remove the call to Libtool.
|
||||||
if test "$libtool" = yes; then
|
if test "$libtool" = yes; then
|
||||||
while test $1 != '--mode=compile'; do
|
while test "X$1" != 'X--mode=compile'; do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
shift
|
shift
|
||||||
|
|
@ -450,32 +467,39 @@ makedepend)
|
||||||
"$@" || exit $?
|
"$@" || exit $?
|
||||||
# Remove any Libtool call
|
# Remove any Libtool call
|
||||||
if test "$libtool" = yes; then
|
if test "$libtool" = yes; then
|
||||||
while test $1 != '--mode=compile'; do
|
while test "X$1" != 'X--mode=compile'; do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
shift
|
shift
|
||||||
fi
|
fi
|
||||||
# X makedepend
|
# X makedepend
|
||||||
shift
|
shift
|
||||||
cleared=no
|
cleared=no eat=no
|
||||||
for arg in "$@"; do
|
for arg
|
||||||
|
do
|
||||||
case $cleared in
|
case $cleared in
|
||||||
no)
|
no)
|
||||||
set ""; shift
|
set ""; shift
|
||||||
cleared=yes ;;
|
cleared=yes ;;
|
||||||
esac
|
esac
|
||||||
|
if test $eat = yes; then
|
||||||
|
eat=no
|
||||||
|
continue
|
||||||
|
fi
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
-D*|-I*)
|
-D*|-I*)
|
||||||
set fnord "$@" "$arg"; shift ;;
|
set fnord "$@" "$arg"; shift ;;
|
||||||
# Strip any option that makedepend may not understand. Remove
|
# Strip any option that makedepend may not understand. Remove
|
||||||
# the object too, otherwise makedepend will parse it as a source file.
|
# the object too, otherwise makedepend will parse it as a source file.
|
||||||
|
-arch)
|
||||||
|
eat=yes ;;
|
||||||
-*|$object)
|
-*|$object)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
set fnord "$@" "$arg"; shift ;;
|
set fnord "$@" "$arg"; shift ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
obj_suffix="`echo $object | sed 's/^.*\././'`"
|
obj_suffix=`echo "$object" | sed 's/^.*\././'`
|
||||||
touch "$tmpdepfile"
|
touch "$tmpdepfile"
|
||||||
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
|
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
|
||||||
rm -f "$depfile"
|
rm -f "$depfile"
|
||||||
|
|
@ -495,7 +519,7 @@ cpp)
|
||||||
|
|
||||||
# Remove the call to Libtool.
|
# Remove the call to Libtool.
|
||||||
if test "$libtool" = yes; then
|
if test "$libtool" = yes; then
|
||||||
while test $1 != '--mode=compile'; do
|
while test "X$1" != 'X--mode=compile'; do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
shift
|
shift
|
||||||
|
|
@ -533,13 +557,27 @@ cpp)
|
||||||
|
|
||||||
msvisualcpp)
|
msvisualcpp)
|
||||||
# Important note: in order to support this mode, a compiler *must*
|
# Important note: in order to support this mode, a compiler *must*
|
||||||
# always write the preprocessed file to stdout, regardless of -o,
|
# always write the preprocessed file to stdout.
|
||||||
# because we must use -o when running libtool.
|
|
||||||
"$@" || exit $?
|
"$@" || exit $?
|
||||||
|
|
||||||
|
# Remove the call to Libtool.
|
||||||
|
if test "$libtool" = yes; then
|
||||||
|
while test "X$1" != 'X--mode=compile'; do
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
shift
|
||||||
|
fi
|
||||||
|
|
||||||
IFS=" "
|
IFS=" "
|
||||||
for arg
|
for arg
|
||||||
do
|
do
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
|
-o)
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
$object)
|
||||||
|
shift
|
||||||
|
;;
|
||||||
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
|
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
|
||||||
set fnord "$@"
|
set fnord "$@"
|
||||||
shift
|
shift
|
||||||
|
|
@ -552,16 +590,23 @@ msvisualcpp)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
"$@" -E |
|
"$@" -E 2>/dev/null |
|
||||||
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
|
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
|
||||||
rm -f "$depfile"
|
rm -f "$depfile"
|
||||||
echo "$object : \\" > "$depfile"
|
echo "$object : \\" > "$depfile"
|
||||||
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
|
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
|
||||||
echo " " >> "$depfile"
|
echo " " >> "$depfile"
|
||||||
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
|
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
|
||||||
rm -f "$tmpdepfile"
|
rm -f "$tmpdepfile"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
msvcmsys)
|
||||||
|
# This case exists only to let depend.m4 do its work. It works by
|
||||||
|
# looking at the text of this script. This case will never be run,
|
||||||
|
# since it is checked for above.
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
|
||||||
none)
|
none)
|
||||||
exec "$@"
|
exec "$@"
|
||||||
;;
|
;;
|
||||||
|
|
@ -580,5 +625,6 @@ exit 0
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||||
# time-stamp-start: "scriptversion="
|
# time-stamp-start: "scriptversion="
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||||
# time-stamp-end: "$"
|
# time-stamp-time-zone: "UTC"
|
||||||
|
# time-stamp-end: "; # UTC"
|
||||||
# End:
|
# End:
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# install - install a program, script, or datafile
|
# install - install a program, script, or datafile
|
||||||
|
|
||||||
scriptversion=2006-10-14.15
|
scriptversion=2009-04-28.21; # UTC
|
||||||
|
|
||||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||||
|
|
@ -48,7 +48,7 @@ IFS=" "" $nl"
|
||||||
# set DOITPROG to echo to test this script
|
# set DOITPROG to echo to test this script
|
||||||
|
|
||||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
||||||
doit="${DOITPROG-}"
|
doit=${DOITPROG-}
|
||||||
if test -z "$doit"; then
|
if test -z "$doit"; then
|
||||||
doit_exec=exec
|
doit_exec=exec
|
||||||
else
|
else
|
||||||
|
|
@ -58,34 +58,49 @@ fi
|
||||||
# Put in absolute file names if you don't have them in your path;
|
# Put in absolute file names if you don't have them in your path;
|
||||||
# or use environment vars.
|
# or use environment vars.
|
||||||
|
|
||||||
mvprog="${MVPROG-mv}"
|
chgrpprog=${CHGRPPROG-chgrp}
|
||||||
cpprog="${CPPROG-cp}"
|
chmodprog=${CHMODPROG-chmod}
|
||||||
chmodprog="${CHMODPROG-chmod}"
|
chownprog=${CHOWNPROG-chown}
|
||||||
chownprog="${CHOWNPROG-chown}"
|
cmpprog=${CMPPROG-cmp}
|
||||||
chgrpprog="${CHGRPPROG-chgrp}"
|
cpprog=${CPPROG-cp}
|
||||||
stripprog="${STRIPPROG-strip}"
|
mkdirprog=${MKDIRPROG-mkdir}
|
||||||
rmprog="${RMPROG-rm}"
|
mvprog=${MVPROG-mv}
|
||||||
mkdirprog="${MKDIRPROG-mkdir}"
|
rmprog=${RMPROG-rm}
|
||||||
|
stripprog=${STRIPPROG-strip}
|
||||||
|
|
||||||
|
posix_glob='?'
|
||||||
|
initialize_posix_glob='
|
||||||
|
test "$posix_glob" != "?" || {
|
||||||
|
if (set -f) 2>/dev/null; then
|
||||||
|
posix_glob=
|
||||||
|
else
|
||||||
|
posix_glob=:
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
'
|
||||||
|
|
||||||
posix_glob=
|
|
||||||
posix_mkdir=
|
posix_mkdir=
|
||||||
|
|
||||||
# Desired mode of installed file.
|
# Desired mode of installed file.
|
||||||
mode=0755
|
mode=0755
|
||||||
|
|
||||||
|
chgrpcmd=
|
||||||
chmodcmd=$chmodprog
|
chmodcmd=$chmodprog
|
||||||
chowncmd=
|
chowncmd=
|
||||||
chgrpcmd=
|
mvcmd=$mvprog
|
||||||
stripcmd=
|
|
||||||
rmcmd="$rmprog -f"
|
rmcmd="$rmprog -f"
|
||||||
mvcmd="$mvprog"
|
stripcmd=
|
||||||
|
|
||||||
src=
|
src=
|
||||||
dst=
|
dst=
|
||||||
dir_arg=
|
dir_arg=
|
||||||
dstarg=
|
dst_arg=
|
||||||
|
|
||||||
|
copy_on_change=false
|
||||||
no_target_directory=
|
no_target_directory=
|
||||||
|
|
||||||
usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
usage="\
|
||||||
|
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
||||||
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
||||||
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
||||||
or: $0 [OPTION]... -d DIRECTORIES...
|
or: $0 [OPTION]... -d DIRECTORIES...
|
||||||
|
|
@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
|
||||||
In the 4th, create DIRECTORIES.
|
In the 4th, create DIRECTORIES.
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
-c (ignored)
|
--help display this help and exit.
|
||||||
-d create directories instead of installing files.
|
--version display version info and exit.
|
||||||
-g GROUP $chgrpprog installed files to GROUP.
|
|
||||||
-m MODE $chmodprog installed files to MODE.
|
-c (ignored)
|
||||||
-o USER $chownprog installed files to USER.
|
-C install only if different (preserve the last data modification time)
|
||||||
-s $stripprog installed files.
|
-d create directories instead of installing files.
|
||||||
-t DIRECTORY install into DIRECTORY.
|
-g GROUP $chgrpprog installed files to GROUP.
|
||||||
-T report an error if DSTFILE is a directory.
|
-m MODE $chmodprog installed files to MODE.
|
||||||
--help display this help and exit.
|
-o USER $chownprog installed files to USER.
|
||||||
--version display version info and exit.
|
-s $stripprog installed files.
|
||||||
|
-t DIRECTORY install into DIRECTORY.
|
||||||
|
-T report an error if DSTFILE is a directory.
|
||||||
|
|
||||||
Environment variables override the default commands:
|
Environment variables override the default commands:
|
||||||
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
|
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
||||||
|
RMPROG STRIPPROG
|
||||||
"
|
"
|
||||||
|
|
||||||
while test $# -ne 0; do
|
while test $# -ne 0; do
|
||||||
case $1 in
|
case $1 in
|
||||||
-c) shift
|
-c) ;;
|
||||||
continue;;
|
|
||||||
|
|
||||||
-d) dir_arg=true
|
-C) copy_on_change=true;;
|
||||||
shift
|
|
||||||
continue;;
|
-d) dir_arg=true;;
|
||||||
|
|
||||||
-g) chgrpcmd="$chgrpprog $2"
|
-g) chgrpcmd="$chgrpprog $2"
|
||||||
shift
|
shift;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
--help) echo "$usage"; exit $?;;
|
--help) echo "$usage"; exit $?;;
|
||||||
|
|
||||||
-m) mode=$2
|
-m) mode=$2
|
||||||
shift
|
|
||||||
shift
|
|
||||||
case $mode in
|
case $mode in
|
||||||
*' '* | *' '* | *'
|
*' '* | *' '* | *'
|
||||||
'* | *'*'* | *'?'* | *'['*)
|
'* | *'*'* | *'?'* | *'['*)
|
||||||
echo "$0: invalid mode: $mode" >&2
|
echo "$0: invalid mode: $mode" >&2
|
||||||
exit 1;;
|
exit 1;;
|
||||||
esac
|
esac
|
||||||
continue;;
|
shift;;
|
||||||
|
|
||||||
-o) chowncmd="$chownprog $2"
|
-o) chowncmd="$chownprog $2"
|
||||||
shift
|
shift;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-s) stripcmd=$stripprog
|
-s) stripcmd=$stripprog;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-t) dstarg=$2
|
-t) dst_arg=$2
|
||||||
shift
|
shift;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-T) no_target_directory=true
|
-T) no_target_directory=true;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
--version) echo "$0 $scriptversion"; exit $?;;
|
--version) echo "$0 $scriptversion"; exit $?;;
|
||||||
|
|
||||||
|
|
@ -165,21 +170,22 @@ while test $# -ne 0; do
|
||||||
|
|
||||||
*) break;;
|
*) break;;
|
||||||
esac
|
esac
|
||||||
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
|
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
||||||
# When -d is used, all remaining arguments are directories to create.
|
# When -d is used, all remaining arguments are directories to create.
|
||||||
# When -t is used, the destination is already specified.
|
# When -t is used, the destination is already specified.
|
||||||
# Otherwise, the last argument is the destination. Remove it from $@.
|
# Otherwise, the last argument is the destination. Remove it from $@.
|
||||||
for arg
|
for arg
|
||||||
do
|
do
|
||||||
if test -n "$dstarg"; then
|
if test -n "$dst_arg"; then
|
||||||
# $@ is not empty: it contains at least $arg.
|
# $@ is not empty: it contains at least $arg.
|
||||||
set fnord "$@" "$dstarg"
|
set fnord "$@" "$dst_arg"
|
||||||
shift # fnord
|
shift # fnord
|
||||||
fi
|
fi
|
||||||
shift # arg
|
shift # arg
|
||||||
dstarg=$arg
|
dst_arg=$arg
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -224,7 +230,7 @@ for src
|
||||||
do
|
do
|
||||||
# Protect names starting with `-'.
|
# Protect names starting with `-'.
|
||||||
case $src in
|
case $src in
|
||||||
-*) src=./$src ;;
|
-*) src=./$src;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test -n "$dir_arg"; then
|
if test -n "$dir_arg"; then
|
||||||
|
|
@ -242,22 +248,22 @@ do
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$dstarg"; then
|
if test -z "$dst_arg"; then
|
||||||
echo "$0: no destination specified." >&2
|
echo "$0: no destination specified." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dst=$dstarg
|
dst=$dst_arg
|
||||||
# Protect names starting with `-'.
|
# Protect names starting with `-'.
|
||||||
case $dst in
|
case $dst in
|
||||||
-*) dst=./$dst ;;
|
-*) dst=./$dst;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# If destination is a directory, append the input filename; won't work
|
# If destination is a directory, append the input filename; won't work
|
||||||
# if double slashes aren't ignored.
|
# if double slashes aren't ignored.
|
||||||
if test -d "$dst"; then
|
if test -d "$dst"; then
|
||||||
if test -n "$no_target_directory"; then
|
if test -n "$no_target_directory"; then
|
||||||
echo "$0: $dstarg: Is a directory" >&2
|
echo "$0: $dst_arg: Is a directory" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
dstdir=$dst
|
dstdir=$dst
|
||||||
|
|
@ -378,26 +384,19 @@ do
|
||||||
# directory the slow way, step by step, checking for races as we go.
|
# directory the slow way, step by step, checking for races as we go.
|
||||||
|
|
||||||
case $dstdir in
|
case $dstdir in
|
||||||
/*) prefix=/ ;;
|
/*) prefix='/';;
|
||||||
-*) prefix=./ ;;
|
-*) prefix='./';;
|
||||||
*) prefix= ;;
|
*) prefix='';;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case $posix_glob in
|
eval "$initialize_posix_glob"
|
||||||
'')
|
|
||||||
if (set -f) 2>/dev/null; then
|
|
||||||
posix_glob=true
|
|
||||||
else
|
|
||||||
posix_glob=false
|
|
||||||
fi ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
oIFS=$IFS
|
oIFS=$IFS
|
||||||
IFS=/
|
IFS=/
|
||||||
$posix_glob && set -f
|
$posix_glob set -f
|
||||||
set fnord $dstdir
|
set fnord $dstdir
|
||||||
shift
|
shift
|
||||||
$posix_glob && set +f
|
$posix_glob set +f
|
||||||
IFS=$oIFS
|
IFS=$oIFS
|
||||||
|
|
||||||
prefixes=
|
prefixes=
|
||||||
|
|
@ -459,41 +458,54 @@ do
|
||||||
# ignore errors from any of these, just make sure not to ignore
|
# ignore errors from any of these, just make sure not to ignore
|
||||||
# errors from the above "$doit $cpprog $src $dsttmp" command.
|
# errors from the above "$doit $cpprog $src $dsttmp" command.
|
||||||
#
|
#
|
||||||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
|
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
|
||||||
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
|
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
|
||||||
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
|
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
|
||||||
&& { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
|
{ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
|
||||||
|
|
||||||
# Now rename the file to the real destination.
|
# If -C, don't bother to copy if it wouldn't change the file.
|
||||||
{ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
|
if $copy_on_change &&
|
||||||
|| {
|
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
||||||
# The rename failed, perhaps because mv can't rename something else
|
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
||||||
# to itself, or perhaps because mv is so ancient that it does not
|
|
||||||
# support -f.
|
|
||||||
|
|
||||||
# Now remove or move aside any old file at destination location.
|
eval "$initialize_posix_glob" &&
|
||||||
# We try this two ways since rm can't unlink itself on some
|
$posix_glob set -f &&
|
||||||
# systems and the destination file might be busy for other
|
set X $old && old=:$2:$4:$5:$6 &&
|
||||||
# reasons. In this case, the final cleanup might fail but the new
|
set X $new && new=:$2:$4:$5:$6 &&
|
||||||
# file should still install successfully.
|
$posix_glob set +f &&
|
||||||
{
|
|
||||||
if test -f "$dst"; then
|
|
||||||
$doit $rmcmd -f "$dst" 2>/dev/null \
|
|
||||||
|| { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
|
|
||||||
&& { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
|
|
||||||
|| {
|
|
||||||
echo "$0: cannot unlink or rename $dst" >&2
|
|
||||||
(exit 1); exit 1
|
|
||||||
}
|
|
||||||
else
|
|
||||||
:
|
|
||||||
fi
|
|
||||||
} &&
|
|
||||||
|
|
||||||
# Now rename the file to the real destination.
|
test "$old" = "$new" &&
|
||||||
$doit $mvcmd "$dsttmp" "$dst"
|
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
||||||
}
|
then
|
||||||
} || exit 1
|
rm -f "$dsttmp"
|
||||||
|
else
|
||||||
|
# Rename the file to the real destination.
|
||||||
|
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
||||||
|
|
||||||
|
# The rename failed, perhaps because mv can't rename something else
|
||||||
|
# to itself, or perhaps because mv is so ancient that it does not
|
||||||
|
# support -f.
|
||||||
|
{
|
||||||
|
# Now remove or move aside any old file at destination location.
|
||||||
|
# We try this two ways since rm can't unlink itself on some
|
||||||
|
# systems and the destination file might be busy for other
|
||||||
|
# reasons. In this case, the final cleanup might fail but the new
|
||||||
|
# file should still install successfully.
|
||||||
|
{
|
||||||
|
test ! -f "$dst" ||
|
||||||
|
$doit $rmcmd -f "$dst" 2>/dev/null ||
|
||||||
|
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
||||||
|
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
|
||||||
|
} ||
|
||||||
|
{ echo "$0: cannot unlink or rename $dst" >&2
|
||||||
|
(exit 1); exit 1
|
||||||
|
}
|
||||||
|
} &&
|
||||||
|
|
||||||
|
# Now rename the file to the real destination.
|
||||||
|
$doit $mvcmd "$dsttmp" "$dst"
|
||||||
|
}
|
||||||
|
fi || exit 1
|
||||||
|
|
||||||
trap '' 0
|
trap '' 0
|
||||||
fi
|
fi
|
||||||
|
|
@ -503,5 +515,6 @@ done
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||||
# time-stamp-start: "scriptversion="
|
# time-stamp-start: "scriptversion="
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||||
# time-stamp-end: "$"
|
# time-stamp-time-zone: "UTC"
|
||||||
|
# time-stamp-end: "; # UTC"
|
||||||
# End:
|
# End:
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Common stub for a few missing GNU programs while installing.
|
# Common stub for a few missing GNU programs while installing.
|
||||||
|
|
||||||
scriptversion=2006-05-10.23
|
scriptversion=2009-04-28.21; # UTC
|
||||||
|
|
||||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
|
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
|
||||||
# Free Software Foundation, Inc.
|
# 2008, 2009 Free Software Foundation, Inc.
|
||||||
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||||
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
|
@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
||||||
# 02110-1301, USA.
|
|
||||||
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
# As a special exception to the GNU General Public License, if you
|
||||||
# distribute this file as part of a program that contains a
|
# distribute this file as part of a program that contains a
|
||||||
|
|
@ -89,6 +87,9 @@ Supported PROGRAM values:
|
||||||
tar try tar, gnutar, gtar, then tar without non-portable flags
|
tar try tar, gnutar, gtar, then tar without non-portable flags
|
||||||
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
||||||
|
|
||||||
|
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
|
||||||
|
\`g' are ignored when checking the name.
|
||||||
|
|
||||||
Send bug reports to <bug-automake@gnu.org>."
|
Send bug reports to <bug-automake@gnu.org>."
|
||||||
exit $?
|
exit $?
|
||||||
;;
|
;;
|
||||||
|
|
@ -106,15 +107,22 @@ Send bug reports to <bug-automake@gnu.org>."
|
||||||
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# normalize program name to check for.
|
||||||
|
program=`echo "$1" | sed '
|
||||||
|
s/^gnu-//; t
|
||||||
|
s/^gnu//; t
|
||||||
|
s/^g//; t'`
|
||||||
|
|
||||||
# Now exit if we have it, but it failed. Also exit now if we
|
# Now exit if we have it, but it failed. Also exit now if we
|
||||||
# don't have it and --version was passed (most likely to detect
|
# don't have it and --version was passed (most likely to detect
|
||||||
# the program).
|
# the program). This is about non-GNU programs, so use $1 not
|
||||||
|
# $program.
|
||||||
case $1 in
|
case $1 in
|
||||||
lex|yacc)
|
lex*|yacc*)
|
||||||
# Not GNU programs, they don't have --version.
|
# Not GNU programs, they don't have --version.
|
||||||
;;
|
;;
|
||||||
|
|
||||||
tar)
|
tar*)
|
||||||
if test -n "$run"; then
|
if test -n "$run"; then
|
||||||
echo 1>&2 "ERROR: \`tar' requires --run"
|
echo 1>&2 "ERROR: \`tar' requires --run"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
@ -138,7 +146,7 @@ esac
|
||||||
|
|
||||||
# If it does not exist, or fails to run (possibly an outdated version),
|
# If it does not exist, or fails to run (possibly an outdated version),
|
||||||
# try to emulate it.
|
# try to emulate it.
|
||||||
case $1 in
|
case $program in
|
||||||
aclocal*)
|
aclocal*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
|
|
@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||||
touch aclocal.m4
|
touch aclocal.m4
|
||||||
;;
|
;;
|
||||||
|
|
||||||
autoconf)
|
autoconf*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified \`${configure_ac}'. You might want to install the
|
you modified \`${configure_ac}'. You might want to install the
|
||||||
|
|
@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||||
touch configure
|
touch configure
|
||||||
;;
|
;;
|
||||||
|
|
||||||
autoheader)
|
autoheader*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
||||||
|
|
@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||||
while read f; do touch "$f"; done
|
while read f; do touch "$f"; done
|
||||||
;;
|
;;
|
||||||
|
|
||||||
autom4te)
|
autom4te*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is needed, but is $msg.
|
WARNING: \`$1' is needed, but is $msg.
|
||||||
You might have modified some files without having the
|
You might have modified some files without having the
|
||||||
|
|
@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
bison|yacc)
|
bison*|yacc*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' $msg. You should only need it if
|
WARNING: \`$1' $msg. You should only need it if
|
||||||
you modified a \`.y' file. You may need the \`Bison' package
|
you modified a \`.y' file. You may need the \`Bison' package
|
||||||
|
|
@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
lex|flex)
|
lex*|flex*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified a \`.l' file. You may need the \`Flex' package
|
you modified a \`.l' file. You may need the \`Flex' package
|
||||||
|
|
@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
help2man)
|
help2man*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified a dependency of a manual page. You may need the
|
you modified a dependency of a manual page. You may need the
|
||||||
|
|
@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||||
else
|
else
|
||||||
test -z "$file" || exec >$file
|
test -z "$file" || exec >$file
|
||||||
echo ".ab help2man is required to generate this page"
|
echo ".ab help2man is required to generate this page"
|
||||||
exit 1
|
exit $?
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
makeinfo)
|
makeinfo*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified a \`.texi' or \`.texinfo' file, or any other file
|
you modified a \`.texi' or \`.texinfo' file, or any other file
|
||||||
|
|
@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if
|
||||||
touch $file
|
touch $file
|
||||||
;;
|
;;
|
||||||
|
|
||||||
tar)
|
tar*)
|
||||||
shift
|
shift
|
||||||
|
|
||||||
# We have already tried tar in the generic part.
|
# We have already tried tar in the generic part.
|
||||||
|
|
@ -363,5 +371,6 @@ exit 0
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||||
# time-stamp-start: "scriptversion="
|
# time-stamp-start: "scriptversion="
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||||
# time-stamp-end: "$"
|
# time-stamp-time-zone: "UTC"
|
||||||
|
# time-stamp-end: "; # UTC"
|
||||||
# End:
|
# End:
|
||||||
|
|
|
||||||
241
xrandr/xrandr.c
241
xrandr/xrandr.c
|
|
@ -39,10 +39,6 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#if RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 2)
|
|
||||||
#define HAS_RANDR_1_2 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static char *program_name;
|
static char *program_name;
|
||||||
static Display *dpy;
|
static Display *dpy;
|
||||||
static Window root;
|
static Window root;
|
||||||
|
|
@ -111,15 +107,10 @@ usage(void)
|
||||||
fprintf(stderr, " --verbose\n");
|
fprintf(stderr, " --verbose\n");
|
||||||
fprintf(stderr, " --dryrun\n");
|
fprintf(stderr, " --dryrun\n");
|
||||||
fprintf(stderr, " --nograb\n");
|
fprintf(stderr, " --nograb\n");
|
||||||
#if HAS_RANDR_1_2
|
|
||||||
fprintf(stderr, " --prop or --properties\n");
|
fprintf(stderr, " --prop or --properties\n");
|
||||||
fprintf(stderr, " --fb <width>x<height>\n");
|
fprintf(stderr, " --fb <width>x<height>\n");
|
||||||
fprintf(stderr, " --fbmm <width>x<height>\n");
|
fprintf(stderr, " --fbmm <width>x<height>\n");
|
||||||
fprintf(stderr, " --dpi <dpi>/<output>\n");
|
fprintf(stderr, " --dpi <dpi>/<output>\n");
|
||||||
#if 0
|
|
||||||
fprintf(stderr, " --clone\n");
|
|
||||||
fprintf(stderr, " --extend\n");
|
|
||||||
#endif
|
|
||||||
fprintf(stderr, " --output <output>\n");
|
fprintf(stderr, " --output <output>\n");
|
||||||
fprintf(stderr, " --auto\n");
|
fprintf(stderr, " --auto\n");
|
||||||
fprintf(stderr, " --mode <mode>\n");
|
fprintf(stderr, " --mode <mode>\n");
|
||||||
|
|
@ -149,7 +140,6 @@ usage(void)
|
||||||
fprintf(stderr, " --rmmode <name>\n");
|
fprintf(stderr, " --rmmode <name>\n");
|
||||||
fprintf(stderr, " --addmode <output> <name>\n");
|
fprintf(stderr, " --addmode <output> <name>\n");
|
||||||
fprintf(stderr, " --delmode <output> <name>\n");
|
fprintf(stderr, " --delmode <output> <name>\n");
|
||||||
#endif
|
|
||||||
|
|
||||||
exit(1);
|
exit(1);
|
||||||
/*NOTREACHED*/
|
/*NOTREACHED*/
|
||||||
|
|
@ -179,6 +169,12 @@ warning (const char *format, ...)
|
||||||
va_end (ap);
|
va_end (ap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Because fmin requires C99 suppport */
|
||||||
|
static inline double dmin (double x, double y)
|
||||||
|
{
|
||||||
|
return x < y ? x : y;
|
||||||
|
}
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
rotation_name (Rotation rotation)
|
rotation_name (Rotation rotation)
|
||||||
{
|
{
|
||||||
|
|
@ -209,13 +205,12 @@ reflection_name (Rotation rotation)
|
||||||
return "invalid reflection";
|
return "invalid reflection";
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAS_RANDR_1_2
|
|
||||||
typedef enum _policy {
|
|
||||||
clone, extend
|
|
||||||
} policy_t;
|
|
||||||
|
|
||||||
typedef enum _relation {
|
typedef enum _relation {
|
||||||
left_of, right_of, above, below, same_as,
|
relation_left_of,
|
||||||
|
relation_right_of,
|
||||||
|
relation_above,
|
||||||
|
relation_below,
|
||||||
|
relation_same_as,
|
||||||
} relation_t;
|
} relation_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
@ -333,6 +328,8 @@ struct _output {
|
||||||
float blue;
|
float blue;
|
||||||
} gamma;
|
} gamma;
|
||||||
|
|
||||||
|
float brightness;
|
||||||
|
|
||||||
Bool primary;
|
Bool primary;
|
||||||
|
|
||||||
Bool found;
|
Bool found;
|
||||||
|
|
@ -635,6 +632,7 @@ add_output (void)
|
||||||
fatal ("out of memory\n");
|
fatal ("out of memory\n");
|
||||||
output->next = NULL;
|
output->next = NULL;
|
||||||
output->found = False;
|
output->found = False;
|
||||||
|
output->brightness = 1.0;
|
||||||
*outputs_tail = output;
|
*outputs_tail = output;
|
||||||
outputs_tail = &output->next;
|
outputs_tail = &output->next;
|
||||||
return output;
|
return output;
|
||||||
|
|
@ -945,6 +943,96 @@ output_is_primary(output_t *output)
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Returns the index of the last value in an array < 0xffff */
|
||||||
|
static int
|
||||||
|
find_last_non_clamped(CARD16 array[], int size) {
|
||||||
|
int i;
|
||||||
|
for (i = size - 1; i > 0; i--) {
|
||||||
|
if (array[i] < 0xffff)
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
set_gamma_info(output_t *output)
|
||||||
|
{
|
||||||
|
XRRCrtcGamma *gamma;
|
||||||
|
double i1, v1, i2, v2;
|
||||||
|
int size, middle, last_best, last_red, last_green, last_blue;
|
||||||
|
CARD16 *best_array;
|
||||||
|
|
||||||
|
if (!output->crtc_info)
|
||||||
|
return;
|
||||||
|
|
||||||
|
size = XRRGetCrtcGammaSize(dpy, output->crtc_info->crtc.xid);
|
||||||
|
if (!size) {
|
||||||
|
warning("Failed to get size of gamma for output %s\n", output->output.string);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
gamma = XRRGetCrtcGamma(dpy, output->crtc_info->crtc.xid);
|
||||||
|
if (!gamma) {
|
||||||
|
warning("Failed to get gamma for output %s\n", output->output.string);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Here is a bit tricky because gamma is a whole curve for each
|
||||||
|
* color. So, typically, we need to represent 3 * 256 values as 3 + 1
|
||||||
|
* values. Therefore, we approximate the gamma curve (v) by supposing
|
||||||
|
* it always follows the way we set it: a power function (i^g)
|
||||||
|
* multiplied by a brightness (b).
|
||||||
|
* v = i^g * b
|
||||||
|
* so g = (ln(v) - ln(b))/ln(i)
|
||||||
|
* and b can be found using two points (v1,i1) and (v2, i2):
|
||||||
|
* b = e^((ln(v2)*ln(i1) - ln(v1)*ln(i2))/ln(i1/i2))
|
||||||
|
* For the best resolution, we select i2 at the highest place not
|
||||||
|
* clamped and i1 at i2/2. Note that if i2 = 1 (as in most normal
|
||||||
|
* cases), then b = v2.
|
||||||
|
*/
|
||||||
|
last_red = find_last_non_clamped(gamma->red, size);
|
||||||
|
last_green = find_last_non_clamped(gamma->green, size);
|
||||||
|
last_blue = find_last_non_clamped(gamma->blue, size);
|
||||||
|
best_array = gamma->red;
|
||||||
|
last_best = last_red;
|
||||||
|
if (last_green > last_best) {
|
||||||
|
last_best = last_green;
|
||||||
|
best_array = gamma->green;
|
||||||
|
}
|
||||||
|
if (last_blue > last_best) {
|
||||||
|
last_best = last_blue;
|
||||||
|
best_array = gamma->blue;
|
||||||
|
}
|
||||||
|
if (last_best == 0)
|
||||||
|
last_best = 1;
|
||||||
|
|
||||||
|
middle = last_best / 2;
|
||||||
|
i1 = (double)(middle + 1) / size;
|
||||||
|
v1 = (double)(best_array[middle]) / 65535;
|
||||||
|
i2 = (double)(last_best + 1) / size;
|
||||||
|
v2 = (double)(best_array[last_best]) / 65535;
|
||||||
|
if (v2 < 0.0001) { /* The screen is black */
|
||||||
|
output->brightness = 0;
|
||||||
|
output->gamma.red = 1;
|
||||||
|
output->gamma.green = 1;
|
||||||
|
output->gamma.blue = 1;
|
||||||
|
} else {
|
||||||
|
if ((last_best + 1) == size)
|
||||||
|
output->brightness = v2;
|
||||||
|
else
|
||||||
|
output->brightness = exp((log(v2)*log(i1) - log(v1)*log(i2))/log(i1/i2));
|
||||||
|
output->gamma.red = log((double)(gamma->red[last_red / 2]) / output->brightness
|
||||||
|
/ 65535) / log((double)((last_red / 2) + 1) / size);
|
||||||
|
output->gamma.green = log((double)(gamma->green[last_green / 2]) / output->brightness
|
||||||
|
/ 65535) / log((double)((last_green / 2) + 1) / size);
|
||||||
|
output->gamma.blue = log((double)(gamma->blue[last_blue / 2]) / output->brightness
|
||||||
|
/ 65535) / log((double)((last_blue / 2) + 1) / size);
|
||||||
|
}
|
||||||
|
|
||||||
|
XRRFreeGamma(gamma);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
set_output_info (output_t *output, RROutput xid, XRROutputInfo *output_info)
|
set_output_info (output_t *output, RROutput xid, XRROutputInfo *output_info)
|
||||||
{
|
{
|
||||||
|
|
@ -1057,6 +1145,10 @@ set_output_info (output_t *output, RROutput xid, XRROutputInfo *output_info)
|
||||||
rotation_name (output->rotation),
|
rotation_name (output->rotation),
|
||||||
reflection_name (output->rotation));
|
reflection_name (output->rotation));
|
||||||
|
|
||||||
|
/* set gamma */
|
||||||
|
if (!(output->changes & changes_gamma))
|
||||||
|
set_gamma_info(output);
|
||||||
|
|
||||||
/* set transformation */
|
/* set transformation */
|
||||||
if (!(output->changes & changes_transform))
|
if (!(output->changes & changes_transform))
|
||||||
{
|
{
|
||||||
|
|
@ -1099,9 +1191,7 @@ get_crtcs (void)
|
||||||
for (c = 0; c < res->ncrtc; c++)
|
for (c = 0; c < res->ncrtc; c++)
|
||||||
{
|
{
|
||||||
XRRCrtcInfo *crtc_info = XRRGetCrtcInfo (dpy, res, res->crtcs[c]);
|
XRRCrtcInfo *crtc_info = XRRGetCrtcInfo (dpy, res, res->crtcs[c]);
|
||||||
#if RANDR_MAJOR > 1 || RANDR_MINOR >= 3
|
|
||||||
XRRCrtcTransformAttributes *attr;
|
XRRCrtcTransformAttributes *attr;
|
||||||
#endif
|
|
||||||
XRRPanning *panning_info = NULL;
|
XRRPanning *panning_info = NULL;
|
||||||
|
|
||||||
if (has_1_3) {
|
if (has_1_3) {
|
||||||
|
|
@ -1127,7 +1217,6 @@ get_crtcs (void)
|
||||||
crtcs[c].y = 0;
|
crtcs[c].y = 0;
|
||||||
crtcs[c].rotation = RR_Rotate_0;
|
crtcs[c].rotation = RR_Rotate_0;
|
||||||
}
|
}
|
||||||
#if RANDR_MAJOR > 1 || RANDR_MINOR >= 3
|
|
||||||
if (XRRGetCrtcTransform (dpy, res->crtcs[c], &attr) && attr) {
|
if (XRRGetCrtcTransform (dpy, res->crtcs[c], &attr) && attr) {
|
||||||
set_transform (&crtcs[c].current_transform,
|
set_transform (&crtcs[c].current_transform,
|
||||||
&attr->currentTransform,
|
&attr->currentTransform,
|
||||||
|
|
@ -1137,7 +1226,6 @@ get_crtcs (void)
|
||||||
XFree (attr);
|
XFree (attr);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
init_transform (&crtcs[c].current_transform);
|
init_transform (&crtcs[c].current_transform);
|
||||||
}
|
}
|
||||||
|
|
@ -1226,24 +1314,30 @@ set_gamma(void)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(output->gamma.red == 0.0 && output->gamma.green == 0.0 && output->gamma.blue == 0.0)
|
||||||
|
output->gamma.red = output->gamma.green = output->gamma.blue = 1.0;
|
||||||
|
|
||||||
for (i = 0; i < size; i++) {
|
for (i = 0; i < size; i++) {
|
||||||
if (output->gamma.red == 1.0)
|
if (output->gamma.red == 1.0 && output->brightness == 1.0)
|
||||||
gamma->red[i] = i << 8;
|
gamma->red[i] = (i << 8) + i;
|
||||||
else
|
else
|
||||||
gamma->red[i] = (CARD16)(pow((double)i/(double)(size - 1),
|
gamma->red[i] = dmin(pow((double)i/(double)(size - 1),
|
||||||
(double)output->gamma.red) * (double)(size - 1) * 256);
|
output->gamma.red) * output->brightness,
|
||||||
|
1.0) * 65535.0;
|
||||||
|
|
||||||
if (output->gamma.green == 1.0)
|
if (output->gamma.green == 1.0 && output->brightness == 1.0)
|
||||||
gamma->green[i] = i << 8;
|
gamma->green[i] = (i << 8) + i;
|
||||||
else
|
else
|
||||||
gamma->green[i] = (CARD16)(pow((double)i/(double)(size - 1),
|
gamma->green[i] = dmin(pow((double)i/(double)(size - 1),
|
||||||
(double)output->gamma.green) * (double)(size - 1) * 256);
|
output->gamma.green) * output->brightness,
|
||||||
|
1.0) * 65535.0;
|
||||||
|
|
||||||
if (output->gamma.blue == 1.0)
|
if (output->gamma.blue == 1.0 && output->brightness == 1.0)
|
||||||
gamma->blue[i] = i << 8;
|
gamma->blue[i] = (i << 8) + i;
|
||||||
else
|
else
|
||||||
gamma->blue[i] = (CARD16)(pow((double)i/(double)(size - 1),
|
gamma->blue[i] = dmin(pow((double)i/(double)(size - 1),
|
||||||
(double)output->gamma.blue) * (double)(size - 1) * 256);
|
output->gamma.blue) * output->brightness,
|
||||||
|
1.0) * 65535.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
XRRSetCrtcGamma(dpy, crtc->crtc.xid, gamma);
|
XRRSetCrtcGamma(dpy, crtc->crtc.xid, gamma);
|
||||||
|
|
@ -1769,23 +1863,23 @@ set_positions (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (output->relation) {
|
switch (output->relation) {
|
||||||
case left_of:
|
case relation_left_of:
|
||||||
output->y = relation->y;
|
output->y = relation->y;
|
||||||
output->x = relation->x - mode_width (output->mode_info, output->rotation);
|
output->x = relation->x - mode_width (output->mode_info, output->rotation);
|
||||||
break;
|
break;
|
||||||
case right_of:
|
case relation_right_of:
|
||||||
output->y = relation->y;
|
output->y = relation->y;
|
||||||
output->x = relation->x + mode_width (relation->mode_info, relation->rotation);
|
output->x = relation->x + mode_width (relation->mode_info, relation->rotation);
|
||||||
break;
|
break;
|
||||||
case above:
|
case relation_above:
|
||||||
output->x = relation->x;
|
output->x = relation->x;
|
||||||
output->y = relation->y - mode_height (output->mode_info, output->rotation);
|
output->y = relation->y - mode_height (output->mode_info, output->rotation);
|
||||||
break;
|
break;
|
||||||
case below:
|
case relation_below:
|
||||||
output->x = relation->x;
|
output->x = relation->x;
|
||||||
output->y = relation->y + mode_height (relation->mode_info, relation->rotation);
|
output->y = relation->y + mode_height (relation->mode_info, relation->rotation);
|
||||||
break;
|
break;
|
||||||
case same_as:
|
case relation_same_as:
|
||||||
output->x = relation->x;
|
output->x = relation->x;
|
||||||
output->y = relation->y;
|
output->y = relation->y;
|
||||||
}
|
}
|
||||||
|
|
@ -1886,7 +1980,6 @@ set_screen_size (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
disable_outputs (output_t *outputs)
|
disable_outputs (output_t *outputs)
|
||||||
|
|
@ -2022,7 +2115,7 @@ check_strtol(char *s)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static double
|
||||||
check_strtod(char *s)
|
check_strtod(char *s)
|
||||||
{
|
{
|
||||||
char *endptr;
|
char *endptr;
|
||||||
|
|
@ -2042,7 +2135,8 @@ main (int argc, char **argv)
|
||||||
short *rates;
|
short *rates;
|
||||||
Status status = RRSetConfigFailed;
|
Status status = RRSetConfigFailed;
|
||||||
int rot = -1;
|
int rot = -1;
|
||||||
int query = 0;
|
int query = False;
|
||||||
|
int action_requested = False;
|
||||||
Rotation rotation, current_rotation, rotations;
|
Rotation rotation, current_rotation, rotations;
|
||||||
XEvent event;
|
XEvent event;
|
||||||
XRRScreenChangeNotifyEvent *sce;
|
XRRScreenChangeNotifyEvent *sce;
|
||||||
|
|
@ -2060,9 +2154,7 @@ main (int argc, char **argv)
|
||||||
int width = 0, height = 0;
|
int width = 0, height = 0;
|
||||||
Bool have_pixel_size = False;
|
Bool have_pixel_size = False;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
#if HAS_RANDR_1_2
|
|
||||||
output_t *output = NULL;
|
output_t *output = NULL;
|
||||||
policy_t policy = clone;
|
|
||||||
Bool setit_1_2 = False;
|
Bool setit_1_2 = False;
|
||||||
Bool query_1_2 = False;
|
Bool query_1_2 = False;
|
||||||
Bool modeit = False;
|
Bool modeit = False;
|
||||||
|
|
@ -2070,10 +2162,8 @@ main (int argc, char **argv)
|
||||||
Bool query_1 = False;
|
Bool query_1 = False;
|
||||||
int major, minor;
|
int major, minor;
|
||||||
Bool current = False;
|
Bool current = False;
|
||||||
#endif
|
|
||||||
|
|
||||||
program_name = argv[0];
|
program_name = argv[0];
|
||||||
if (argc == 1) query = True;
|
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
if (!strcmp ("-display", argv[i]) || !strcmp ("-d", argv[i])) {
|
if (!strcmp ("-display", argv[i]) || !strcmp ("-d", argv[i])) {
|
||||||
if (++i>=argc) usage ();
|
if (++i>=argc) usage ();
|
||||||
|
|
@ -2082,6 +2172,7 @@ main (int argc, char **argv)
|
||||||
}
|
}
|
||||||
if (!strcmp("-help", argv[i])) {
|
if (!strcmp("-help", argv[i])) {
|
||||||
usage();
|
usage();
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--verbose", argv[i])) {
|
if (!strcmp ("--verbose", argv[i])) {
|
||||||
|
|
@ -2099,8 +2190,6 @@ main (int argc, char **argv)
|
||||||
}
|
}
|
||||||
if (!strcmp("--current", argv[i])) {
|
if (!strcmp("--current", argv[i])) {
|
||||||
current = True;
|
current = True;
|
||||||
/* if --current was the only arg, then query */
|
|
||||||
if (argc == 2) query = True;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2113,6 +2202,7 @@ main (int argc, char **argv)
|
||||||
if (size < 0) usage();
|
if (size < 0) usage();
|
||||||
}
|
}
|
||||||
setit = True;
|
setit = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2123,30 +2213,32 @@ main (int argc, char **argv)
|
||||||
if (++i>=argc) usage ();
|
if (++i>=argc) usage ();
|
||||||
rate = check_strtod(argv[i]);
|
rate = check_strtod(argv[i]);
|
||||||
setit = True;
|
setit = True;
|
||||||
#if HAS_RANDR_1_2
|
|
||||||
if (output)
|
if (output)
|
||||||
{
|
{
|
||||||
output->refresh = rate;
|
output->refresh = rate;
|
||||||
output->changes |= changes_refresh;
|
output->changes |= changes_refresh;
|
||||||
setit_1_2 = True;
|
setit_1_2 = True;
|
||||||
}
|
}
|
||||||
#endif
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strcmp ("-v", argv[i]) || !strcmp ("--version", argv[i])) {
|
if (!strcmp ("-v", argv[i]) || !strcmp ("--version", argv[i])) {
|
||||||
version = True;
|
version = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strcmp ("-x", argv[i])) {
|
if (!strcmp ("-x", argv[i])) {
|
||||||
reflection |= RR_Reflect_X;
|
reflection |= RR_Reflect_X;
|
||||||
setit = True;
|
setit = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("-y", argv[i])) {
|
if (!strcmp ("-y", argv[i])) {
|
||||||
reflection |= RR_Reflect_Y;
|
reflection |= RR_Reflect_Y;
|
||||||
setit = True;
|
setit = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--screen", argv[i])) {
|
if (!strcmp ("--screen", argv[i])) {
|
||||||
|
|
@ -2171,9 +2263,9 @@ main (int argc, char **argv)
|
||||||
}
|
}
|
||||||
rot = dirind;
|
rot = dirind;
|
||||||
setit = True;
|
setit = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#if HAS_RANDR_1_2
|
|
||||||
if (!strcmp ("--prop", argv[i]) ||
|
if (!strcmp ("--prop", argv[i]) ||
|
||||||
!strcmp ("--props", argv[i]) ||
|
!strcmp ("--props", argv[i]) ||
|
||||||
!strcmp ("--madprops", argv[i]) ||
|
!strcmp ("--madprops", argv[i]) ||
|
||||||
|
|
@ -2181,6 +2273,7 @@ main (int argc, char **argv)
|
||||||
{
|
{
|
||||||
query_1_2 = True;
|
query_1_2 = True;
|
||||||
properties = True;
|
properties = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--output", argv[i])) {
|
if (!strcmp ("--output", argv[i])) {
|
||||||
|
|
@ -2193,6 +2286,7 @@ main (int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
setit_1_2 = True;
|
setit_1_2 = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--crtc", argv[i])) {
|
if (!strcmp ("--crtc", argv[i])) {
|
||||||
|
|
@ -2253,7 +2347,7 @@ main (int argc, char **argv)
|
||||||
if (!strcmp ("--left-of", argv[i])) {
|
if (!strcmp ("--left-of", argv[i])) {
|
||||||
if (++i>=argc) usage ();
|
if (++i>=argc) usage ();
|
||||||
if (!output) usage();
|
if (!output) usage();
|
||||||
output->relation = left_of;
|
output->relation = relation_left_of;
|
||||||
output->relative_to = argv[i];
|
output->relative_to = argv[i];
|
||||||
output->changes |= changes_relation;
|
output->changes |= changes_relation;
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -2261,7 +2355,7 @@ main (int argc, char **argv)
|
||||||
if (!strcmp ("--right-of", argv[i])) {
|
if (!strcmp ("--right-of", argv[i])) {
|
||||||
if (++i>=argc) usage ();
|
if (++i>=argc) usage ();
|
||||||
if (!output) usage();
|
if (!output) usage();
|
||||||
output->relation = right_of;
|
output->relation = relation_right_of;
|
||||||
output->relative_to = argv[i];
|
output->relative_to = argv[i];
|
||||||
output->changes |= changes_relation;
|
output->changes |= changes_relation;
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -2269,7 +2363,7 @@ main (int argc, char **argv)
|
||||||
if (!strcmp ("--above", argv[i])) {
|
if (!strcmp ("--above", argv[i])) {
|
||||||
if (++i>=argc) usage ();
|
if (++i>=argc) usage ();
|
||||||
if (!output) usage();
|
if (!output) usage();
|
||||||
output->relation = above;
|
output->relation = relation_above;
|
||||||
output->relative_to = argv[i];
|
output->relative_to = argv[i];
|
||||||
output->changes |= changes_relation;
|
output->changes |= changes_relation;
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -2277,7 +2371,7 @@ main (int argc, char **argv)
|
||||||
if (!strcmp ("--below", argv[i])) {
|
if (!strcmp ("--below", argv[i])) {
|
||||||
if (++i>=argc) usage ();
|
if (++i>=argc) usage ();
|
||||||
if (!output) usage();
|
if (!output) usage();
|
||||||
output->relation = below;
|
output->relation = relation_below;
|
||||||
output->relative_to = argv[i];
|
output->relative_to = argv[i];
|
||||||
output->changes |= changes_relation;
|
output->changes |= changes_relation;
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -2285,7 +2379,7 @@ main (int argc, char **argv)
|
||||||
if (!strcmp ("--same-as", argv[i])) {
|
if (!strcmp ("--same-as", argv[i])) {
|
||||||
if (++i>=argc) usage ();
|
if (++i>=argc) usage ();
|
||||||
if (!output) usage();
|
if (!output) usage();
|
||||||
output->relation = same_as;
|
output->relation = relation_same_as;
|
||||||
output->relative_to = argv[i];
|
output->relative_to = argv[i];
|
||||||
output->changes |= changes_relation;
|
output->changes |= changes_relation;
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -2330,6 +2424,15 @@ main (int argc, char **argv)
|
||||||
setit_1_2 = True;
|
setit_1_2 = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if (!strcmp ("--brightness", argv[i])) {
|
||||||
|
if (!output) usage();
|
||||||
|
if (++i>=argc) usage();
|
||||||
|
if (sscanf(argv[i], "%f", &output->brightness) != 1)
|
||||||
|
usage ();
|
||||||
|
output->changes |= changes_gamma;
|
||||||
|
setit_1_2 = True;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (!strcmp ("--primary", argv[i])) {
|
if (!strcmp ("--primary", argv[i])) {
|
||||||
if (!output) usage();
|
if (!output) usage();
|
||||||
output->changes |= changes_primary;
|
output->changes |= changes_primary;
|
||||||
|
|
@ -2360,6 +2463,7 @@ main (int argc, char **argv)
|
||||||
if (!strcmp ("--scale", argv[i]))
|
if (!strcmp ("--scale", argv[i]))
|
||||||
{
|
{
|
||||||
double sx, sy;
|
double sx, sy;
|
||||||
|
if (!output) usage();
|
||||||
if (++i>=argc) usage();
|
if (++i>=argc) usage();
|
||||||
if (sscanf (argv[i], "%lfx%lf", &sx, &sy) != 2)
|
if (sscanf (argv[i], "%lfx%lf", &sx, &sy) != 2)
|
||||||
usage ();
|
usage ();
|
||||||
|
|
@ -2379,6 +2483,7 @@ main (int argc, char **argv)
|
||||||
if (!strcmp ("--transform", argv[i])) {
|
if (!strcmp ("--transform", argv[i])) {
|
||||||
double transform[3][3];
|
double transform[3][3];
|
||||||
int k, l;
|
int k, l;
|
||||||
|
if (!output) usage();
|
||||||
if (++i>=argc) usage ();
|
if (++i>=argc) usage ();
|
||||||
init_transform (&output->transform);
|
init_transform (&output->transform);
|
||||||
if (strcmp (argv[i], "none") != 0)
|
if (strcmp (argv[i], "none") != 0)
|
||||||
|
|
@ -2414,6 +2519,7 @@ main (int argc, char **argv)
|
||||||
&fb_width, &fb_height) != 2)
|
&fb_width, &fb_height) != 2)
|
||||||
usage ();
|
usage ();
|
||||||
setit_1_2 = True;
|
setit_1_2 = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--fbmm", argv[i])) {
|
if (!strcmp ("--fbmm", argv[i])) {
|
||||||
|
|
@ -2422,6 +2528,7 @@ main (int argc, char **argv)
|
||||||
&fb_width_mm, &fb_height_mm) != 2)
|
&fb_width_mm, &fb_height_mm) != 2)
|
||||||
usage ();
|
usage ();
|
||||||
setit_1_2 = True;
|
setit_1_2 = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--dpi", argv[i])) {
|
if (!strcmp ("--dpi", argv[i])) {
|
||||||
|
|
@ -2434,16 +2541,7 @@ main (int argc, char **argv)
|
||||||
dpi_output = argv[i];
|
dpi_output = argv[i];
|
||||||
}
|
}
|
||||||
setit_1_2 = True;
|
setit_1_2 = True;
|
||||||
continue;
|
action_requested = True;
|
||||||
}
|
|
||||||
if (!strcmp ("--clone", argv[i])) {
|
|
||||||
policy = clone;
|
|
||||||
setit_1_2 = True;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (!strcmp ("--extend", argv[i])) {
|
|
||||||
policy = extend;
|
|
||||||
setit_1_2 = True;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--auto", argv[i])) {
|
if (!strcmp ("--auto", argv[i])) {
|
||||||
|
|
@ -2455,6 +2553,7 @@ main (int argc, char **argv)
|
||||||
else
|
else
|
||||||
automatic = True;
|
automatic = True;
|
||||||
setit_1_2 = True;
|
setit_1_2 = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--q12", argv[i]))
|
if (!strcmp ("--q12", argv[i]))
|
||||||
|
|
@ -2505,6 +2604,7 @@ main (int argc, char **argv)
|
||||||
m->action = umode_create;
|
m->action = umode_create;
|
||||||
umodes = m;
|
umodes = m;
|
||||||
modeit = True;
|
modeit = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--rmmode", argv[i]))
|
if (!strcmp ("--rmmode", argv[i]))
|
||||||
|
|
@ -2517,6 +2617,7 @@ main (int argc, char **argv)
|
||||||
m->next = umodes;
|
m->next = umodes;
|
||||||
umodes = m;
|
umodes = m;
|
||||||
modeit = True;
|
modeit = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--addmode", argv[i]))
|
if (!strcmp ("--addmode", argv[i]))
|
||||||
|
|
@ -2531,6 +2632,7 @@ main (int argc, char **argv)
|
||||||
m->next = umodes;
|
m->next = umodes;
|
||||||
umodes = m;
|
umodes = m;
|
||||||
modeit = True;
|
modeit = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp ("--delmode", argv[i]))
|
if (!strcmp ("--delmode", argv[i]))
|
||||||
|
|
@ -2545,11 +2647,13 @@ main (int argc, char **argv)
|
||||||
m->next = umodes;
|
m->next = umodes;
|
||||||
umodes = m;
|
umodes = m;
|
||||||
modeit = True;
|
modeit = True;
|
||||||
|
action_requested = True;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
usage();
|
usage();
|
||||||
}
|
}
|
||||||
|
if (!action_requested)
|
||||||
|
query = True;
|
||||||
if (verbose)
|
if (verbose)
|
||||||
{
|
{
|
||||||
query = True;
|
query = True;
|
||||||
|
|
@ -2575,7 +2679,6 @@ main (int argc, char **argv)
|
||||||
|
|
||||||
root = RootWindow (dpy, screen);
|
root = RootWindow (dpy, screen);
|
||||||
|
|
||||||
#if HAS_RANDR_1_2
|
|
||||||
if (!XRRQueryVersion (dpy, &major, &minor))
|
if (!XRRQueryVersion (dpy, &major, &minor))
|
||||||
{
|
{
|
||||||
fprintf (stderr, "RandR extension missing\n");
|
fprintf (stderr, "RandR extension missing\n");
|
||||||
|
|
@ -2910,6 +3013,11 @@ main (int argc, char **argv)
|
||||||
printf ("\tIdentifier: 0x%x\n", (int)output->output.xid);
|
printf ("\tIdentifier: 0x%x\n", (int)output->output.xid);
|
||||||
printf ("\tTimestamp: %d\n", (int)output_info->timestamp);
|
printf ("\tTimestamp: %d\n", (int)output_info->timestamp);
|
||||||
printf ("\tSubpixel: %s\n", order[output_info->subpixel_order]);
|
printf ("\tSubpixel: %s\n", order[output_info->subpixel_order]);
|
||||||
|
if (output->gamma.red != 0.0 && output->gamma.green != 0.0 && output->gamma.blue != 0.0) {
|
||||||
|
printf ("\tGamma: %#.2g:%#.2g:%#.2g\n",
|
||||||
|
output->gamma.red, output->gamma.green, output->gamma.blue);
|
||||||
|
printf ("\tBrightness: %#.2g\n", output->brightness);
|
||||||
|
}
|
||||||
printf ("\tClones: ");
|
printf ("\tClones: ");
|
||||||
for (j = 0; j < output_info->nclone; j++)
|
for (j = 0; j < output_info->nclone; j++)
|
||||||
{
|
{
|
||||||
|
|
@ -3127,7 +3235,6 @@ main (int argc, char **argv)
|
||||||
}
|
}
|
||||||
exit (0);
|
exit (0);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
sc = XRRGetScreenInfo (dpy, root);
|
sc = XRRGetScreenInfo (dpy, root);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,6 @@
|
||||||
.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
.\" PERFORMANCE OF THIS SOFTWARE.
|
.\" PERFORMANCE OF THIS SOFTWARE.
|
||||||
.\"
|
.\"
|
||||||
.\"
|
|
||||||
.\" $XFree86: xc/programs/xrandr/xrandr.man,v 1.6 2003/06/12 14:12:39 eich Exp $
|
|
||||||
.\"
|
|
||||||
.TH XRANDR __appmansuffix__ __vendorversion__
|
.TH XRANDR __appmansuffix__ __vendorversion__
|
||||||
.SH NAME
|
.SH NAME
|
||||||
xrandr \- primitive command line interface to RandR extension
|
xrandr \- primitive command line interface to RandR extension
|
||||||
|
|
@ -77,6 +74,7 @@ xrandr \- primitive command line interface to RandR extension
|
||||||
[\-\-off]
|
[\-\-off]
|
||||||
[\-\-crtc \fIcrtc\fP]
|
[\-\-crtc \fIcrtc\fP]
|
||||||
[\-\-gamma \fIred\fP:\fIgreen\fP:\fIblue\fP]
|
[\-\-gamma \fIred\fP:\fIgreen\fP:\fIblue\fP]
|
||||||
|
[\-\-brightness \fIbrightness\fP]
|
||||||
|
|
||||||
.br
|
.br
|
||||||
.B RandR version 1.0 and version 1.1 options
|
.B RandR version 1.0 and version 1.1 options
|
||||||
|
|
@ -104,7 +102,9 @@ Print out a summary of the usage and exit.
|
||||||
Print out the RandR version reported by the X server and exit.
|
Print out the RandR version reported by the X server and exit.
|
||||||
.IP \-\-verbose
|
.IP \-\-verbose
|
||||||
Causes xrandr to be more verbose. When used with \-q (or without other
|
Causes xrandr to be more verbose. When used with \-q (or without other
|
||||||
options), xrandr will display more information about the server state. When
|
options), xrandr will display more information about the server state. Please
|
||||||
|
note that the gamma and brightness informations are only approximations of the
|
||||||
|
complete color profile stored in the server. When
|
||||||
used along with options that reconfigure the system, progress will be
|
used along with options that reconfigure the system, progress will be
|
||||||
reported while executing the configuration changes.
|
reported while executing the configuration changes.
|
||||||
.IP "\-q, \-\-query"
|
.IP "\-q, \-\-query"
|
||||||
|
|
@ -158,13 +158,31 @@ d e f
|
||||||
.br
|
.br
|
||||||
g h i
|
g h i
|
||||||
.RE
|
.RE
|
||||||
The transformation matrix multiplied by a coordinate vector of a pixel of the
|
The transformation is based on homogeneous coordinates. The matrix multiplied
|
||||||
output (extended to 3 values) gives the approximate coordinate vector of a pixel
|
by the coordinate vector of a pixel of the output gives the transformed
|
||||||
in the graphic buffer. Typically, \fIa\fP and
|
coordinate vector of a pixel in the graphic buffer. More precisely, the vector
|
||||||
|
.RI "(x y)"
|
||||||
|
of the output pixel is extended to 3 values
|
||||||
|
.RI "(x y w),"
|
||||||
|
with 1 as the w coordinate and multiplied against the matrix. The final device
|
||||||
|
coordinates of the pixel are then calculated with the so-called homogenic
|
||||||
|
division by the transformed w coordinate. In other words, the device
|
||||||
|
coordinates
|
||||||
|
.RI "(x' y')"
|
||||||
|
of the transformed pixel are:
|
||||||
|
.RS
|
||||||
|
x' = (ax + by + c) / w' and
|
||||||
|
.br
|
||||||
|
y' = (dx + ey + f) / w' ,
|
||||||
|
.br
|
||||||
|
with w' = (gx + hy + i) .
|
||||||
|
.RE
|
||||||
|
Typically, \fIa\fP and
|
||||||
\fIe\fP corresponds to the scaling on the X and Y axes, \fIc\fP and \fIf\fP
|
\fIe\fP corresponds to the scaling on the X and Y axes, \fIc\fP and \fIf\fP
|
||||||
corresponds to the tranlastion on those axes, and \fIg\fP, \fIh\fP, and \fIi\fP
|
corresponds to the translation on those axes, and \fIg\fP, \fIh\fP, and \fIi\fP
|
||||||
are respectively 0, 0 and 1. It also allows to express a rotation of an angle T
|
are respectively 0, 0 and 1. The matrix can also be used to express more
|
||||||
with:
|
complex transformations such as keystone correction, or rotation. For a
|
||||||
|
rotation of an angle T, this formula can be used:
|
||||||
.RS
|
.RS
|
||||||
cos T -sin T 0
|
cos T -sin T 0
|
||||||
.br
|
.br
|
||||||
|
|
@ -268,8 +286,13 @@ for some reason, this option can override the normal selection.
|
||||||
.IP "\-\-gamma \fIred\fP:\fIgreen\fP:\fIblue\fP"
|
.IP "\-\-gamma \fIred\fP:\fIgreen\fP:\fIblue\fP"
|
||||||
Set the specified floating point values as gamma correction on the crtc
|
Set the specified floating point values as gamma correction on the crtc
|
||||||
currently attached to this output. Note that you cannot get two different values
|
currently attached to this output. Note that you cannot get two different values
|
||||||
for cloned outputs and that switching an output to another crtc doesn't change
|
for cloned outputs (i.e.: which share the same crtc) and that switching an output to another crtc doesn't change
|
||||||
the crtc gamma corrections at all.
|
the crtc gamma corrections at all.
|
||||||
|
.IP "\-\-brightness \fIbrightness\fP"
|
||||||
|
Multiply the gamma values on the crtc currently attached to the output to
|
||||||
|
specified floating value. Useful for overly bright or overly dim outputs.
|
||||||
|
However, this is a software only modification, if your hardware has support to
|
||||||
|
actually change the brightness, you will probably prefer to use \fBxbacklight\fR.
|
||||||
.PP
|
.PP
|
||||||
.SH "RandR version 1.1 options"
|
.SH "RandR version 1.1 options"
|
||||||
These options are available for X servers supporting RandR version 1.1 or
|
These options are available for X servers supporting RandR version 1.1 or
|
||||||
|
|
@ -313,8 +336,14 @@ big VGA screen display the surrounding of the mouse at normal size.
|
||||||
.RS
|
.RS
|
||||||
xrandr --fb 3200x2000 --output LVDS --scale 2.5x2.5 --output VGA --pos 0x0 --panning 3200x2000+0+0/3200x2000+0+0/64/64/64/64
|
xrandr --fb 3200x2000 --output LVDS --scale 2.5x2.5 --output VGA --pos 0x0 --panning 3200x2000+0+0/3200x2000+0+0/64/64/64/64
|
||||||
.RE
|
.RE
|
||||||
|
.PP
|
||||||
|
Displays the VGA output in trapezoid shape so that it is keystone corrected
|
||||||
|
when the projector is slightly above the screen:
|
||||||
|
.RS
|
||||||
|
xrandr --fb 1024x768 --output VGA --transform 1.24,0.16,-124,0,1.24,0,0,0.000316,1
|
||||||
|
.RE
|
||||||
.SH "SEE ALSO"
|
.SH "SEE ALSO"
|
||||||
Xrandr(3), cvt(1)
|
Xrandr(3), cvt(1), xkeystone(1), xbacklight(1)
|
||||||
.SH AUTHORS
|
.SH AUTHORS
|
||||||
Keith Packard,
|
Keith Packard,
|
||||||
Open Source Technology Center, Intel Corporation.
|
Open Source Technology Center, Intel Corporation.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue