diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2012-03-08 11:50:05 -0800 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@canonical.com> | 2012-03-16 15:23:18 -0700 |
| commit | e0f7ec50461b68851cfb13c7b73c1ee4faa7a7d5 (patch) | |
| tree | 76e375c48c1af4080624d7637f0d4ed95019a087 | |
| parent | 7102f4115ed044a903c5071e6930630456778313 (diff) | |
Add a meta-header xorg-gtest.h
The header merely includes all the other headers. It will make building
xorg-gtest into each project easier.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/Makefile.am | 8 | ||||
| -rw-r--r-- | include/xorg/gtest/xorg-gtest.h | 34 |
3 files changed, 38 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 9d04d40..1082886 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,7 @@ AS_IF([test "x$with_evemu" == xyes], [test "x$with_evemu" == xcheck], [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes], [:])]) AM_CONDITIONAL([HAVE_EVEMU], [test "x$have_evemu" = "xyes"]) +AS_IF([test "x$have_evemu" = xyes], [AC_DEFINE([HAVE_EVEMU])]) AC_CONFIG_FILES([Makefile data/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index ffc7767..0256685 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -26,8 +26,6 @@ nobase_include_HEADERS = \ xorg/gtest/environment.h \ xorg/gtest/process.h \ - xorg/gtest/test.h - -if HAVE_EVEMU -nobase_include_HEADERS += xorg/gtest/evemu/device.h -endif + xorg/gtest/test.h \ + xorg/gtest/evemu/device.h \ + xorg/gtest/xorg-gtest.h diff --git a/include/xorg/gtest/xorg-gtest.h b/include/xorg/gtest/xorg-gtest.h new file mode 100644 index 0000000..5568185 --- /dev/null +++ b/include/xorg/gtest/xorg-gtest.h @@ -0,0 +1,34 @@ +/******************************************************************************* + * + * X testing environment - Google Test environment feat. dummy x server + * + * Copyright (C) 2011, 2012 Canonical Ltd. + * + * 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 (including the next + * paragraph) 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 + * AUTHORS OR COPYRIGHT HOLDERS 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. + * + ******************************************************************************/ + +#include "environment.h" +#include "process.h" +#include "test.h" + +#ifdef HAVE_EVEMU +#include "evemu/device.h" +#endif |