[Mesa-dev] [PATCH 08/37] gtest: move source file lists to Makefile.sources

[Emil Velikov]

* Allow the lists to be shared among build systems.
* *.la files are hangled by top .gitignore, drop local one.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gtest/.gitignore       |  1 -
 src/gtest/Makefile.am      | 15 +++------------
 src/gtest/Makefile.sources | 13 +++++++++++++
 3 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 src/gtest/.gitignore
 create mode 100644 src/gtest/Makefile.sources

diff --git a/src/gtest/.gitignore b/src/gtest/.gitignore
deleted file mode 100644
index 3dac369..0000000
--- a/src/gtest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libgtest.la
diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am
index 4188c6b..c1f40a7 100644
--- a/src/gtest/Makefile.am
+++ b/src/gtest/Makefile.am
@@ -18,22 +18,13 @@
 # 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 Makefile.sources
 
 AM_CFLAGS = $(DEFINES) -I$(top_srcdir)/src/gtest/include
 AM_CXXFLAGS = $(DEFINES) -I$(top_srcdir)/src/gtest/include
 
 check_LTLIBRARIES = libgtest.la
 
-libgtest_la_SOURCES = \
-	src/gtest-all.cc \
-	src/gtest_main.cc
+libgtest_la_SOURCES = $(GTEST_FILES)
 
-EXTRA_DIST = \
-	src/gtest.cc \
-	src/gtest-death-test.cc \
-	src/gtest-filepath.cc \
-	src/gtest-internal-inl.h \
-	src/gtest-port.cc \
-	src/gtest-printers.cc \
-	src/gtest-test-part.cc \
-	src/gtest-typed-test.cc
+EXTRA_DIST = $(DIST_FILES)
diff --git a/src/gtest/Makefile.sources b/src/gtest/Makefile.sources
new file mode 100644
index 0000000..5cfc39e
--- /dev/null
+++ b/src/gtest/Makefile.sources
@@ -0,0 +1,13 @@
+GTEST_FILES := \
+	src/gtest-all.cc \
+	src/gtest_main.cc
+
+DIST_FILES := \
+	src/gtest.cc \
+	src/gtest-death-test.cc \
+	src/gtest-filepath.cc \
+	src/gtest-internal-inl.h \
+	src/gtest-port.cc \
+	src/gtest-printers.cc \
+	src/gtest-test-part.cc \
+	src/gtest-typed-test.cc
-- 
1.8.4.2