diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-10-07 18:11:43 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-10-07 18:11:43 -0700 |
commit | 7f299010c9327ab1a65a6b781c58b4c3098d13b7 (patch) | |
tree | dee543292f20c9ae0312e4bfb3118167ae017788 | |
parent | 99bb38c528f87a2692253ede9f54c4320c6f0986 (diff) |
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | cleanlinks | 2 | ||||
-rw-r--r-- | cleanlinks.man | 4 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | imake.man | 30 | ||||
-rw-r--r-- | makeg.man | 8 | ||||
-rw-r--r-- | mdepend.cpp | 6 | ||||
-rw-r--r-- | mergelib.cpp | 16 | ||||
-rw-r--r-- | mkdirhier.man | 22 | ||||
-rw-r--r-- | mkhtmlindex.man | 4 | ||||
-rw-r--r-- | xmkmf.cpp | 6 | ||||
-rw-r--r-- | xmkmf.man | 26 |
12 files changed, 67 insertions, 67 deletions
diff --git a/Makefile.am b/Makefile.am index 6a932f3..e5eb246 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -1,7 +1,7 @@ #!/bin/sh # # Copyright © 2000, 2003 by The XFree86 Project, Inc -# +# # Remove dangling symlinks and empty directories from a shadow link tree # (created with lndir). # diff --git a/cleanlinks.man b/cleanlinks.man index d550ef5..a498214 100644 --- a/cleanlinks.man +++ b/cleanlinks.man @@ -21,9 +21,9 @@ directory. .BR lndir (1). .SH AUTHOR .PP -The version of the +The version of the .I cleanlinks -included in this X.Org Foundation release was originally written +included in this X.Org Foundation release was originally written by David Dawes wrote as a part of XFree86. .PP Colin Watson wrote this manual page, originally for the Debian Project. diff --git a/configure.ac b/configure.ac index 2083d29..56f89c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ dnl advertising or publicity pertaining to distribution of the software without dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -5,10 +5,10 @@ .\" the above copyright notice appear in all copies and that both that .\" copyright notice and this permission notice appear in supporting .\" documentation. -.\" +.\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. -.\" +.\" .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS .\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF .\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -16,7 +16,7 @@ .\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, .\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR .\" OTHER DEALINGS IN THE SOFTWARE. -.\" +.\" .\" Except as contained in this notice, the name of The Open Group shall .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization @@ -27,14 +27,14 @@ imake \- C preprocessor interface to the make utility .SH SYNOPSIS \fBimake\fP [ \fB\-D\fP\fIdefine\fP ] [ \fB\-I\fP\fIdir\fP ] -[ \fB\-U\fP\fIdefine\fP ] +[ \fB\-U\fP\fIdefine\fP ] [ \fB\-T\fP\fItemplate\fP ] [ \fB\-f\fP \fIfilename\fP ] [ \fB\-C\fP \fIfilename\fP ] [ \fB\-s\fP \fIfilename\fP ] [ \fB\-e\fP ] [ \fB\-v\fP ] .SH DESCRIPTION .I Imake -is used to +is used to generate \fIMakefiles\fP from a template, a set of \fIcpp\fP macro functions, and a per-directory input file called an \fIImakefile\fP. This allows machine dependencies (such as compiler options, alternate command names, and special @@ -47,11 +47,11 @@ The following command line options may be passed to \fIimake\fP: This option is passed directly to \fIcpp\fP. It is typically used to set directory-specific variables. For example, the X Window System used this flag to set \fITOPDIR\fP to the name of the directory containing the top -of the core distribution and \fICURDIR\fP to the name of the current +of the core distribution and \fICURDIR\fP to the name of the current directory, relative to the top. .TP 8 .B \-I\fIdirectory\fP -This option is passed directly to \fIcpp\fP. It is typically used to +This option is passed directly to \fIcpp\fP. It is typically used to indicate the directory in which the \fIimake\fP template and configuration files may be found. .TP 8 @@ -73,9 +73,9 @@ This option specifies the name of the .c file that is constructed in the current directory. The default is \fIImakefile.c\fP. .TP 8 .B \-s \fIfilename\fP -This option specifies the name of the \fImake\fP description file to be +This option specifies the name of the \fImake\fP description file to be generated but \fImake\fP should not be invoked. -If the \fIfilename\fP is a dash (\-), the +If the \fIfilename\fP is a dash (\-), the output is written to \fIstdout\fP. The default is to generate, but not execute, a \fIMakefile\fP. .TP 8 @@ -84,7 +84,7 @@ This option indicates the \fIimake\fP should execute the generated \fIMakefile\fP. The default is to leave this to the user. .TP 8 .B \-v -This option indicates that \fIimake\fP should print the \fIcpp\fP command line +This option indicates that \fIimake\fP should print the \fIcpp\fP command line that it is using to generate the \fIMakefile\fP. .SH "HOW IT WORKS" \fIImake\fP invokes \fIcpp\fP with any \fI\-I\fP or \fI\-D\fP flags passed @@ -97,16 +97,16 @@ following 3 lines: \& #include IMAKE_TEMPLATE .fi .sp -where \fIImake.tmpl\fP and \fIImakefile\fP may be overridden by the +where \fIImake.tmpl\fP and \fIImakefile\fP may be overridden by the \fI\-T\fP and \fI\-f\fP command options, respectively. .PP The IMAKE_TEMPLATE typically -reads in a file containing machine-dependent parameters +reads in a file containing machine-dependent parameters (specified as \fIcpp\fP symbols), a site-specific parameters file, a file defining variables, a file containing \fIcpp\fP macro functions for generating \fImake\fP rules, and -finally the \fIImakefile\fP (specified by INCLUDE_IMAKEFILE) in the current +finally the \fIImakefile\fP (specified by INCLUDE_IMAKEFILE) in the current directory. The \fIImakefile\fP uses the macro functions to indicate what targets should be built; \fIimake\fP takes care of generating the appropriate rules. @@ -124,9 +124,9 @@ By convention make variables are upper case. .PP The rules file (usually named \fIImake.rules\fP in the configuration directory) contains a variety of \fIcpp\fP macro functions that are -configured according to the current platform. \fIImake\fP replaces +configured according to the current platform. \fIImake\fP replaces any occurrences of the string ``@@'' with a newline to allow macros that -generate more than one line of \fImake\fP rules. +generate more than one line of \fImake\fP rules. For example, the macro .ta 1i 1.6i 5i .nf @@ -1,14 +1,14 @@ .\" Copyright (c) 1996, 1998 The Open Group -.\" +.\" .\" Permission to use, copy, modify, distribute, and sell this software and its .\" documentation for any purpose is hereby granted without fee, provided that .\" the above copyright notice appear in all copies and that both that .\" copyright notice and this permission notice appear in supporting .\" documentation. -.\" +.\" .\" The above copyright notice and this permission notice shall be .\" included in all copies or substantial portions of the Software. -.\" +.\" .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, .\" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF .\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -16,7 +16,7 @@ .\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, .\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR .\" OTHER DEALINGS IN THE SOFTWARE. -.\" +.\" .\" Except as contained in this notice, the name of The Open Group shall .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization diff --git a/mdepend.cpp b/mdepend.cpp index 4998206..c1f5f57 100644 --- a/mdepend.cpp +++ b/mdepend.cpp @@ -78,7 +78,7 @@ do *) if [ "$endmarker"x = x ]; then - case "$1" in + case "$1" in -w) width="$2" shift @@ -103,7 +103,7 @@ do objsuffix="$2" shift ;; - + --*) echo "$1" | sed 's/^\-\-//' >${TMP}end endmarker="`cat ${TMP}end`" @@ -176,7 +176,7 @@ case "$makefile" in ;; esac -if [ "$verbose"x = "y"x ]; then +if [ "$verbose"x = "y"x ]; then cat $CPPCMD fi diff --git a/mergelib.cpp b/mergelib.cpp index 173c023..afb4a91 100644 --- a/mergelib.cpp +++ b/mergelib.cpp @@ -1,29 +1,29 @@ XCOMM!/bin/sh XCOMM XCOMM Copyright (c) 1989, 1998 The Open Group -XCOMM -XCOMM Permission to use, copy, modify, distribute, and sell this software and +XCOMM +XCOMM Permission to use, copy, modify, distribute, and sell this software and XCOMM its documentation for any purpose is hereby granted without fee, provided XCOMM that the above copyright notice appear in all copies and that both that XCOMM copyright notice and this permission notice appear in supporting XCOMM documentation. -XCOMM +XCOMM XCOMM The above copyright notice and this permission notice shall be included in XCOMM all copies or substantial portions of the Software. -XCOMM +XCOMM XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR XCOMM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, XCOMM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE XCOMM OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN XCOMM AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN XCOMM CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -XCOMM +XCOMM XCOMM Except as contained in this notice, the name of The Open Group shall not be XCOMM used in advertising or otherwise to promote the sale, use or other dealings XCOMM in this Software without prior written authorization from The Open Group. -XCOMM +XCOMM XCOMM Author: Jim Fulton, MIT X Consortium -XCOMM +XCOMM XCOMM mergelib - merge one library into another; this is commonly used by X XCOMM to add the extension library into the base Xlib. XCOMM @@ -52,7 +52,7 @@ fi XCOMM -XCOMM Create a temp directory, and figure out how to reference the +XCOMM Create a temp directory, and figure out how to reference the XCOMM object files from it (i.e. relative vs. absolute path names). XCOMM diff --git a/mkdirhier.man b/mkdirhier.man index fe86f96..b890588 100644 --- a/mkdirhier.man +++ b/mkdirhier.man @@ -1,25 +1,25 @@ .\" Copyright (c) 1993, 1994, 1998 The Open Group -.\" +.\" .\" Permission to use, copy, modify, distribute, and sell this software and its .\" documentation for any purpose is hereby granted without fee, provided that .\" the above copyright notice appear in all copies and that both that .\" copyright notice and this permission notice appear in supporting .\" documentation. -.\" +.\" .\" The above copyright notice and this permission notice shall be included in .\" all copies or substantial portions of the Software. -.\" +.\" .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR .\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE .\" SOFTWARE. -.\" -.\" Except as contained in this notice, the name of The Open Group shall not -.\" be used in advertising or otherwise to promote the sale, use or other -.\" dealing in this Software without prior written authorization from The +.\" +.\" Except as contained in this notice, the name of The Open Group shall not +.\" be used in advertising or otherwise to promote the sale, use or other +.\" dealing in this Software without prior written authorization from The .\" Open Group. .\" .TH MKDIRHIER 1 __xorgversion__ diff --git a/mkhtmlindex.man b/mkhtmlindex.man index fc8a427..14d6689 100644 --- a/mkhtmlindex.man +++ b/mkhtmlindex.man @@ -24,9 +24,9 @@ This utility is currently rather specific to X manual pages. In particular, the format of the index files it outputs is not configurable, nor is the HTML formatting it expects of manual pages. .SH AUTHOR -The version of the +The version of the .I mkhtmlindex -included in this X.Org Foundation release was originally written +included in this X.Org Foundation release was originally written by David Dawes wrote as a part of XFree86. .PP Colin Watson wrote this manual page, originally for the Debian Project. @@ -27,7 +27,7 @@ do esac done -case $# in +case $# in 0) ;; 1) topdir=$1 ;; 2) topdir=$1 curdir=$2 ;; @@ -38,7 +38,7 @@ case "$topdir" in -*) echo "$usage" 1>&2; exit 1 ;; esac -if [ -f Makefile ]; then +if [ -f Makefile ]; then echo mv -f Makefile Makefile.bak mv -f Makefile Makefile.bak fi @@ -52,7 +52,7 @@ fi echo imake $imake_defines $args case "$do_all" in yes) - imake $imake_defines $args && + imake $imake_defines $args && echo "make Makefiles" && make Makefiles && echo "make includes" && @@ -1,25 +1,25 @@ .\" Copyright (c) 1993, 1994, 1998 The Open Group -.\" +.\" .\" Permission to use, copy, modify, distribute, and sell this software and its .\" documentation for any purpose is hereby granted without fee, provided that .\" the above copyright notice appear in all copies and that both that .\" copyright notice and this permission notice appear in supporting .\" documentation. -.\" +.\" .\" The above copyright notice and this permission notice shall be included in .\" all copies or substantial portions of the Software. -.\" +.\" .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR .\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE .\" SOFTWARE. -.\" -.\" Except as contained in this notice, the name of The Open Group shall not -.\" be used in advertising or otherwise to promote the sale, use or other -.\" dealing in this Software without prior written authorization from The +.\" +.\" Except as contained in this notice, the name of The Open Group shall not +.\" be used in advertising or otherwise to promote the sale, use or other +.\" dealing in this Software without prior written authorization from The .\" Open Group. .\" .TH XMKMF 1 __xorgversion__ @@ -36,7 +36,7 @@ xmkmf \- create a Makefile from an Imakefile The .I xmkmf command is the normal way to create a -.I Makefile +.I Makefile from an .I Imakefile shipped with third-party software. @@ -64,7 +64,7 @@ and ``make depend'' for you. This is the normal way to configure software that is outside the X Consortium build tree. .PP -If working inside the X Consortium build tree (unlikely unless you +If working inside the X Consortium build tree (unlikely unless you are an X developer, and even then this option is never really used), the .I topdir argument should be specified as the relative pathname from the |