[PATCH video-vmware 1/2] vmwarectrl: rework standalone package as a subdir of driver
Thomas Hellstrom
thomas at shipmail.org
Thu Aug 19 02:06:17 PDT 2010
Gaetan,
This looks fine except a typo in the commit message. Should be
--enable-vmwarectrl-client.
Acked-by: Thomas Hellstrom <thellstrom at vmware.com>
Please push after fixing the commit message.
/Thomas
On 08/18/2010 09:54 PM, Gaetan Nadon wrote:
> vmwarectrl is a unit test client tool for developers.
> By default, it is not built unless --enable-vmwareclient-client is used.
>
> Signed-off-by: Gaetan Nadon<memsize at videotron.ca>
> ---
> Makefile.am | 2 +-
> configure.ac | 11 +++
> vmwarectrl/AUTHORS | 1 -
> vmwarectrl/COPYING | 26 ------
> vmwarectrl/ChangeLog | 8 --
> vmwarectrl/INSTALL | 229 -----------------------------------------------
> vmwarectrl/Makefile.am | 12 ++-
> vmwarectrl/NEWS | 4 -
> vmwarectrl/README | 6 --
> vmwarectrl/autogen.sh | 12 ---
> vmwarectrl/configure.ac | 12 ---
> 11 files changed, 20 insertions(+), 303 deletions(-)
> delete mode 100644 vmwarectrl/AUTHORS
> delete mode 100644 vmwarectrl/COPYING
> delete mode 100644 vmwarectrl/ChangeLog
> delete mode 100644 vmwarectrl/INSTALL
> delete mode 100644 vmwarectrl/NEWS
> delete mode 100644 vmwarectrl/README
> delete mode 100755 vmwarectrl/autogen.sh
> delete mode 100644 vmwarectrl/configure.ac
>
> diff --git a/Makefile.am b/Makefile.am
> index 00c154d..093e9f5 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -18,7 +18,7 @@
> # 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.
>
> -SUBDIRS = src man
> +SUBDIRS = src man vmwarectrl
> MAINTAINERCLEANFILES = ChangeLog INSTALL
> .PHONY: ChangeLog INSTALL
>
> diff --git a/configure.ac b/configure.ac
> index 52335e7..7249ca1 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -56,6 +56,13 @@ AC_ARG_WITH(xorg-module-dir,
> [moduledir="$withval"],
> [moduledir="$libdir/xorg/modules"])
>
> +# Define a configure option to build the vmwarectrl client tool
> +AC_ARG_ENABLE(vmwarectrl-client,
> + AS_HELP_STRING([--enable-vmwarectrl-client],
> + [Enable vmwarectrl client (default: disabled)]),
> + [VMWARECTRL=$enableval], [VMWARECTRL=no])
> +AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes])
> +
> # Store the list of server defined optional extensions in REQUIRED_MODULES
> XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
> XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
> @@ -86,6 +93,9 @@ PKG_CHECK_EXISTS([xorg-server>= 1.7.0],
> [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
> [Has version 1.7.0 or greater of the Xserver])])
>
> +# Obtain compiler/linker options for the vmwarectrl client tool
> +PKG_CHECK_MODULES(X11, x11 xext)
> +
> # Checks for libraries.
>
> save_CFLAGS="$CFLAGS"
> @@ -109,6 +119,7 @@ AC_SUBST([DRIVER_NAME])
> AC_CONFIG_FILES([
> Makefile
> src/Makefile
> + vmwarectrl/Makefile
> man/Makefile
> ])
> AC_OUTPUT
> diff --git a/vmwarectrl/AUTHORS b/vmwarectrl/AUTHORS
> deleted file mode 100644
> index 80d256f..0000000
> --- a/vmwarectrl/AUTHORS
> +++ /dev/null
> @@ -1 +0,0 @@
> -Philip Langdale<plangdale at vmware.com>
> diff --git a/vmwarectrl/COPYING b/vmwarectrl/COPYING
> deleted file mode 100644
> index 6635b04..0000000
> --- a/vmwarectrl/COPYING
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -/*
> - * Copyright 2006 by VMware, Inc.
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s)
> - * and author(s) shall not be used in advertising or otherwise to promote
> - * the sale, use or other dealings in this Software without prior written
> - * authorization from the copyright holder(s) and author(s).
> - */
> diff --git a/vmwarectrl/ChangeLog b/vmwarectrl/ChangeLog
> deleted file mode 100644
> index 81a3e5b..0000000
> --- a/vmwarectrl/ChangeLog
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -2006-10-11 Philip Langdale<plangdale at vmware.com>
> -
> - * 0.2 Release.
> - Adds support for VMWARE_CTRL 0.2
> -
> -2006-02-07 Philip Langdale<plangdale at vmware.com>
> -
> - * Initial 0.1 Release.
> diff --git a/vmwarectrl/INSTALL b/vmwarectrl/INSTALL
> deleted file mode 100644
> index 54caf7c..0000000
> --- a/vmwarectrl/INSTALL
> +++ /dev/null
> @@ -1,229 +0,0 @@
> -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
> -Foundation, Inc.
> -
> - This file is free documentation; the Free Software Foundation gives
> -unlimited permission to copy, distribute and modify it.
> -
> -Basic Installation
> -==================
> -
> - These are generic installation instructions.
> -
> - The `configure' shell script attempts to guess correct values for
> -various system-dependent variables used during compilation. It uses
> -those values to create a `Makefile' in each directory of the package.
> -It may also create one or more `.h' files containing system-dependent
> -definitions. Finally, it creates a shell script `config.status' that
> -you can run in the future to recreate the current configuration, and a
> -file `config.log' containing compiler output (useful mainly for
> -debugging `configure').
> -
> - It can also use an optional file (typically called `config.cache'
> -and enabled with `--cache-file=config.cache' or simply `-C') that saves
> -the results of its tests to speed up reconfiguring. (Caching is
> -disabled by default to prevent problems with accidental use of stale
> -cache files.)
> -
> - If you need to do unusual things to compile the package, please try
> -to figure out how `configure' could check whether to do them, and mail
> -diffs or instructions to the address given in the `README' so they can
> -be considered for the next release. If you are using the cache, and at
> -some point `config.cache' contains results you don't want to keep, you
> -may remove or edit it.
> -
> - The file `configure.ac' (or `configure.in') is used to create
> -`configure' by a program called `autoconf'. You only need
> -`configure.ac' if you want to change it or regenerate `configure' using
> -a newer version of `autoconf'.
> -
> -The simplest way to compile this package is:
> -
> - 1. `cd' to the directory containing the package's source code and type
> - `./configure' to configure the package for your system. If you're
> - using `csh' on an old version of System V, you might need to type
> - `sh ./configure' instead to prevent `csh' from trying to execute
> - `configure' itself.
> -
> - Running `configure' takes awhile. While running, it prints some
> - messages telling which features it is checking for.
> -
> - 2. Type `make' to compile the package.
> -
> - 3. Optionally, type `make check' to run any self-tests that come with
> - the package.
> -
> - 4. Type `make install' to install the programs and any data files and
> - documentation.
> -
> - 5. You can remove the program binaries and object files from the
> - source code directory by typing `make clean'. To also remove the
> - files that `configure' created (so you can compile the package for
> - a different kind of computer), type `make distclean'. There is
> - also a `make maintainer-clean' target, but that is intended mainly
> - for the package's developers. If you use it, you may have to get
> - all sorts of other programs in order to regenerate files that came
> - with the distribution.
> -
> -Compilers and Options
> -=====================
> -
> - Some systems require unusual options for compilation or linking that
> -the `configure' script does not know about. Run `./configure --help'
> -for details on some of the pertinent environment variables.
> -
> - You can give `configure' initial values for configuration parameters
> -by setting variables in the command line or in the environment. Here
> -is an example:
> -
> - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
> -
> - *Note Defining Variables::, for more details.
> -
> -Compiling For Multiple Architectures
> -====================================
> -
> - You can compile the package for more than one kind of computer at the
> -same time, by placing the object files for each architecture in their
> -own directory. To do this, you must use a version of `make' that
> -supports the `VPATH' variable, such as GNU `make'. `cd' to the
> -directory where you want the object files and executables to go and run
> -the `configure' script. `configure' automatically checks for the
> -source code in the directory that `configure' is in and in `..'.
> -
> - If you have to use a `make' that does not support the `VPATH'
> -variable, you have to compile the package for one architecture at a
> -time in the source code directory. After you have installed the
> -package for one architecture, use `make distclean' before reconfiguring
> -for another architecture.
> -
> -Installation Names
> -==================
> -
> - By default, `make install' will install the package's files in
> -`/usr/local/bin', `/usr/local/man', etc. You can specify an
> -installation prefix other than `/usr/local' by giving `configure' the
> -option `--prefix=PATH'.
> -
> - You can specify separate installation prefixes for
> -architecture-specific files and architecture-independent files. If you
> -give `configure' the option `--exec-prefix=PATH', the package will use
> -PATH as the prefix for installing programs and libraries.
> -Documentation and other data files will still use the regular prefix.
> -
> - In addition, if you use an unusual directory layout you can give
> -options like `--bindir=PATH' to specify different values for particular
> -kinds of files. Run `configure --help' for a list of the directories
> -you can set and what kinds of files go in them.
> -
> - If the package supports it, you can cause programs to be installed
> -with an extra prefix or suffix on their names by giving `configure' the
> -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
> -
> -Optional Features
> -=================
> -
> - Some packages pay attention to `--enable-FEATURE' options to
> -`configure', where FEATURE indicates an optional part of the package.
> -They may also pay attention to `--with-PACKAGE' options, where PACKAGE
> -is something like `gnu-as' or `x' (for the X Window System). The
> -`README' should mention any `--enable-' and `--with-' options that the
> -package recognizes.
> -
> - For packages that use the X Window System, `configure' can usually
> -find the X include and library files automatically, but if it doesn't,
> -you can use the `configure' options `--x-includes=DIR' and
> -`--x-libraries=DIR' to specify their locations.
> -
> -Specifying the System Type
> -==========================
> -
> - There may be some features `configure' cannot figure out
> -automatically, but needs to determine by the type of machine the package
> -will run on. Usually, assuming the package is built to be run on the
> -_same_ architectures, `configure' can figure that out, but if it prints
> -a message saying it cannot guess the machine type, give it the
> -`--build=TYPE' option. TYPE can either be a short name for the system
> -type, such as `sun4', or a canonical name which has the form:
> -
> - CPU-COMPANY-SYSTEM
> -
> -where SYSTEM can have one of these forms:
> -
> - OS KERNEL-OS
> -
> - See the file `config.sub' for the possible values of each field. If
> -`config.sub' isn't included in this package, then this package doesn't
> -need to know the machine type.
> -
> - If you are _building_ compiler tools for cross-compiling, you should
> -use the `--target=TYPE' option 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
> -
> -will cause the specified gcc to be used as the C compiler (unless it is
> -overridden in the site shell script).
> -
> -`configure' Invocation
> -======================
> -
> - `configure' recognizes the following options to control how it
> -operates.
> -
> -`--help'
> -`-h'
> - Print a summary of the options to `configure', and exit.
> -
> -`--version'
> -`-V'
> - Print the version of Autoconf used to generate the `configure'
> - script, and exit.
> -
> -`--cache-file=FILE'
> - Enable the cache: use and save the results of the tests in FILE,
> - traditionally `config.cache'. FILE defaults to `/dev/null' to
> - disable caching.
> -
> -`--config-cache'
> -`-C'
> - Alias for `--cache-file=config.cache'.
> -
> -`--quiet'
> -`--silent'
> -`-q'
> - Do not print messages saying which checks are being made. To
> - suppress all normal output, redirect it to `/dev/null' (any error
> - messages will still be shown).
> -
> -`--srcdir=DIR'
> - Look for the package's source code in directory DIR. Usually
> - `configure' can determine that directory automatically.
> -
> -`configure' also accepts some other, not widely useful, options. Run
> -`configure --help' for more details.
> -
> diff --git a/vmwarectrl/Makefile.am b/vmwarectrl/Makefile.am
> index 9df209d..ed19384 100644
> --- a/vmwarectrl/Makefile.am
> +++ b/vmwarectrl/Makefile.am
> @@ -1,8 +1,12 @@
> -## Process this file with automake to produce Makefile.in
>
> -AUTOMAKE_OPTIONS = dist-bzip2
> +if BUILD_VMWARECTRL
>
> bin_PROGRAMS = vmwarectrl
> +
> +AM_CPPFLAGS = -I$(top_srcdir)/src
> +AM_CFLAGS = $(X11_CFLAGS)
> +AM_LDFLAGS = $(X11_LIBS)
> +
> vmwarectrl_SOURCES = vmwarectrl.c libvmwarectrl.c libvmwarectrl.h
> -vmwarectrl_CPPFLAGS = @X11_CFLAGS@ -I../src/
> -vmwarectrl_LDADD = @X11_LIBS@
> +
> +endif BUILD_VMWARECTRL
> diff --git a/vmwarectrl/NEWS b/vmwarectrl/NEWS
> deleted file mode 100644
> index aac183a..0000000
> --- a/vmwarectrl/NEWS
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -What's new in 0.1
> -------------------
> -
> -* Initial release
> diff --git a/vmwarectrl/README b/vmwarectrl/README
> deleted file mode 100644
> index cf1e40b..0000000
> --- a/vmwarectrl/README
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -vmwarectrl
> -----------
> -
> -This is a sample VMWARE_CTRL client. Someone interested in using
> -VMWARE_CTRL should use libvmwarectrl.[c|h] from this directory
> -and the main vmwarectrl.h and vmwarectrlproto.h
> diff --git a/vmwarectrl/autogen.sh b/vmwarectrl/autogen.sh
> deleted file mode 100755
> index 904cd67..0000000
> --- a/vmwarectrl/autogen.sh
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -#! /bin/sh
> -
> -srcdir=`dirname $0`
> -test -z "$srcdir"&& srcdir=.
> -
> -ORIGDIR=`pwd`
> -cd $srcdir
> -
> -autoreconf -v --install || exit 1
> -cd $ORIGDIR || exit $?
> -
> -$srcdir/configure --enable-maintainer-mode "$@"
> diff --git a/vmwarectrl/configure.ac b/vmwarectrl/configure.ac
> deleted file mode 100644
> index b5e0dbb..0000000
> --- a/vmwarectrl/configure.ac
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -AC_INIT(vmwarectrl, 0.2)
> -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
> -AM_CONFIG_HEADER(config.h)
> -
> -AC_PROG_CC
> -
> -PKG_CHECK_MODULES(X11, x11 xext)
> -AC_SUBST(X11_CFLAGS)
> -AC_SUBST(X11_LIBS)
> -
> -AC_CONFIG_FILES([Makefile])
> -AC_OUTPUT
> --
> 1.6.0.4
>
>
More information about the xorg-devel
mailing list