diff mbox

[v2,03/11] build: Move logic to tests/Makefile.am and away from Makefile.sources

Message ID 1384257045-15524-4-git-send-email-oscar.mateo@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

oscar.mateo@intel.com Nov. 12, 2013, 11:50 a.m. UTC 
From: Oscar Mateo <oscar.mateo@intel.com>

Makefile.sources is just a listing with all the sources, and the logic
to use these sources goes into either Makefile.am (automake) or
Android.mk (make).

Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
---
 tests/Makefile.am      |    4 ++++
 tests/Makefile.sources |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9e1b13f..8e293f7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,9 @@ 
 include Makefile.sources
 
+if HAVE_NOUVEAU
+    TESTS_progs_M += $(NOUVEAU_TESTS_M)
+endif
+
 if BUILD_TESTS
 list-single-tests:
 	@echo TESTLIST
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 311f4b6..5f4d282 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -7,13 +7,11 @@  noinst_PROGRAMS = \
 	$(TESTS_testsuite) \
 	$(NULL)
 
-if HAVE_NOUVEAU
 NOUVEAU_TESTS_M = \
 	prime_nv_api \
 	prime_nv_pcopy \
 	prime_nv_test \
 	$(NULL)
-endif
 
 TESTS_progs_M = \
 	drv_suspend \
@@ -55,7 +53,6 @@  TESTS_progs_M = \
 	kms_pipe_crc_basic \
 	kms_render \
 	kms_setmode \
-	$(NOUVEAU_TESTS_M) \
 	pm_pc8 \
 	prime_self_import \
 	template \