[PATCH xorg-gtest v2 5/9] Provide meta-source file xorg-gtest-all.cpp
Chase Douglas
chase.douglas at canonical.com
Tue Mar 13 11:47:42 PDT 2012
This will make compiling the project each time it is used much easier.
Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
src/Makefile.am | 5 +----
src/xorg-gtest-all.cpp | 31 +++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 4 deletions(-)
create mode 100644 src/xorg-gtest-all.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index bfe1b16..e12e772 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,10 +27,7 @@ lib_LTLIBRARIES = libxorg-gtest.la libxorg-gtest_main.la
AM_CXXFLAGS = -I$(top_srcdir)/include $(XSERVER_CFLAGS) $(BASE_CXXFLAGS)
-libxorg_gtest_la_SOURCES = \
- environment.cpp \
- process.cpp \
- test.cpp
+libxorg_gtest_la_SOURCES = xorg-gtest-all.cpp
libxorg_gtest_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
diff --git a/src/xorg-gtest-all.cpp b/src/xorg-gtest-all.cpp
new file mode 100644
index 0000000..d00c3a7
--- /dev/null
+++ b/src/xorg-gtest-all.cpp
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ *
+ * 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 "src/device.cpp"
+#include "src/environment.cpp"
+#include "src/process.cpp"
+#include "src/test.cpp"
--
1.7.9.1
More information about the xorg-devel
mailing list