From: oscar.mateo@intel.com
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 03/11] build: Move logic to tests/Makefile.am and away from Makefile.sources
Date: Tue, 12 Nov 2013 11:50:37 +0000 [thread overview]
Message-ID: <1384257045-15524-4-git-send-email-oscar.mateo@intel.com> (raw)
In-Reply-To: <1384257045-15524-1-git-send-email-oscar.mateo@intel.com>
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 --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 \
--
1.7.9.5
next prev parent reply other threads:[~2013-11-12 10:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-12 11:50 [PATCH v2 00/11] Android build sytem oscar.mateo
2013-11-12 11:50 ` [PATCH v2 01/11] build: list all test/tool/lib source files in their own Makefile.sources oscar.mateo
2013-11-12 11:50 ` [PATCH v2 02/11] build: Fix missing "\" in tests/Makefile.sources oscar.mateo
2013-11-12 11:50 ` oscar.mateo [this message]
2013-11-12 11:50 ` [PATCH v2 04/11] lib: Move kms stuff from drmtest.c over to igt_kms.c oscar.mateo
2013-11-12 11:50 ` [PATCH v2 05/11] rendercopy: Remove rendercopy.c oscar.mateo
2013-11-12 11:50 ` [PATCH v2 06/11] tests/drm_get_client_auth: In Android, use gettid() instead of syscall(SYS_gettid) oscar.mateo
2013-11-12 11:50 ` [PATCH v2 07/11] tests/gem_vmap_blits: Finish extracting gem_read oscar.mateo
2013-11-12 11:50 ` [PATCH v2 08/11] build: Fix assorted compilation warnings oscar.mateo
2013-11-12 11:50 ` [PATCH v2 09/11] lib/drmtest: Get the correct basename() under Android oscar.mateo
2013-11-12 11:50 ` [PATCH v2 10/11] lib/igt_display: workaround a name conflict in Android oscar.mateo
2013-11-12 11:50 ` [PATCH v2 11/11] build: New Android makefiles oscar.mateo
2013-11-12 11:55 ` [PATCH v2 00/11] Android build sytem Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384257045-15524-4-git-send-email-oscar.mateo@intel.com \
--to=oscar.mateo@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.