[PATCH xorg-gtest 1/5] Split data and include build rules out of src build rules

[Chase Douglas]

This will simplify things when we add more features to xorg-gtest.

Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
 Makefile.am                |    4 ++--
 conf/dummy.conf            |    4 ----
 configure.ac               |    6 +++++-
 data/Makefile.am           |   26 ++++++++++++++++++++++++++
 data/xorg/gtest/dummy.conf |    4 ++++
 include/Makefile.am        |   29 +++++++++++++++++++++++++++++
 src/Makefile.am            |    8 --------
 7 files changed, 66 insertions(+), 15 deletions(-)
 delete mode 100644 conf/dummy.conf
 create mode 100644 data/Makefile.am
 create mode 100644 data/xorg/gtest/dummy.conf
 create mode 100644 include/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7c86ac9..2542b44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 # SOFTWARE.
 #
 
-SUBDIRS = src doc examples
+SUBDIRS = data doc include src examples
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-gtest.pc
@@ -45,4 +45,4 @@ doc:
 
 dist-hook: ChangeLog INSTALL
 
-EXTRA_DIST = conf
+EXTRA_DIST = data
diff --git a/conf/dummy.conf b/conf/dummy.conf
deleted file mode 100644
index 5600991..0000000
--- a/conf/dummy.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Section "Device"
-    Identifier "Dummy video device"
-    Driver "dummy"
-EndSection
diff --git a/configure.ac b/configure.ac
index 715b667..40a0e70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,10 @@ AC_CONFIG_FILES([Makefile
                 
 AC_SUBST(AM_CPPFLAGS, "-Wall -Werror")
 
-AC_CONFIG_FILES([doc/Makefile examples/Makefile src/Makefile])
+AC_CONFIG_FILES([data/Makefile
+                 doc/Makefile
+                 examples/Makefile
+                 include/Makefile
+                 src/Makefile])
 
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..bf74a73
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,26 @@
+#
+# Makefile for the src subdirectory of xorg-gtest
+#
+# Copyright (C) 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.
+#
+
+nobase_data_DATA = xorg/gtest/dummy.conf
diff --git a/data/xorg/gtest/dummy.conf b/data/xorg/gtest/dummy.conf
new file mode 100644
index 0000000..5600991
--- /dev/null
+++ b/data/xorg/gtest/dummy.conf
@@ -0,0 +1,4 @@
+Section "Device"
+    Identifier "Dummy video device"
+    Driver "dummy"
+EndSection
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..14768c3
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,29 @@
+#
+# Makefile for the src subdirectory of xorg-gtest
+#
+# Copyright (C) 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.
+#
+
+nobase_include_HEADERS = \
+	xorg/gtest/environment.h \
+	xorg/gtest/process.h \
+	xorg/gtest/test.h
diff --git a/src/Makefile.am b/src/Makefile.am
index cc4898b..06a5e12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,14 +41,6 @@ libxorg_gtest_main_la_SOURCES = \
 
 libxorg_gtest_main_la_LIBADD = libxorg-gtest.la
 
-library_includedir = $(includedir)/xorg/gtest
-library_include_HEADERS = \
-	$(top_srcdir)/include/xorg/gtest/environment.h \
-	$(top_srcdir)/include/xorg/gtest/process.h \
-	$(top_srcdir)/include/xorg/gtest/test.h
-library_datadir = $(datadir)/xorg/gtest
-library_data_DATA = $(top_srcdir)/conf/dummy.conf
-
 libxorg_gtest_main_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(GTEST_CPPFLAGS)
-- 
1.7.9