From 98952a1f6e7e5439e4b77482bd08422212c32e47 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 4 Feb 2014 13:10:37 +0100 Subject: [PATCH] fix make distcheck Bunch of explicit include paths needed adjustments and eviction_common.c needs to be added to the dist files. This has been broken in the following three commits: commit 42bcd05eb3f1545fbf9c397c3f37c3f6a27c5da4 Author: Tvrtko Ursulin Date: Mon Feb 3 10:59:41 2014 +0000 tests/eviction_common: Avoid submitting duplicate objects commit b92b397d5e4ffe10ed92fb2fc6711758ef5bcf89 Author: Tvrtko Ursulin Date: Tue Dec 3 15:09:57 2013 +0000 build: Make sure asserts are enabled for tests commit 8c33e9ad111d27b84db4daac43809a807f262632 Author: Ben Widawsky Date: Fri Dec 6 20:35:29 2013 -0800 intel-gpu-tools: Version informatio Cc: Tvrtko Ursulin Cc: Ben Widawsky Signed-off-by: Daniel Vetter --- tests/Makefile.am | 6 +++--- tests/Makefile.sources | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f4a7d41..ac0c0d8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,15 +16,15 @@ list-multi-tests: @echo END TESTLIST EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG) $(TESTS_testsuite) -EXTRA_DIST = $(TESTS_scripts) $(TESTS_scripts_M) $(scripts) $(IMAGES) +EXTRA_DIST = $(TESTS_scripts) $(TESTS_scripts_M) $(scripts) $(IMAGES) $(common_files) CLEANFILES = $(EXTRA_PROGRAMS) AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib \ - -include "check-ndebug.h" \ - -include "$(srcdir)/version.h" \ + -include "$(srcdir)/../lib/check-ndebug.h" \ + -include "$(srcdir)/../version.h" \ -DIGT_DATADIR=\""$(abs_srcdir)"\" \ $(NULL) diff --git a/tests/Makefile.sources b/tests/Makefile.sources index cb96b09..4299ed9 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -217,3 +217,7 @@ testdisplay_SOURCES = \ TESTS_progs += testdisplay +common_files = \ + eviction_common.c \ + $(NULL) + -- 2.7.4