From mboxrd@z Thu Jan 1 00:00:00 1970 From: oscar.mateo@intel.com 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 Message-ID: <1384257045-15524-4-git-send-email-oscar.mateo@intel.com> References: <1384257045-15524-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DF47FA930 for ; Tue, 12 Nov 2013 02:54:10 -0800 (PST) In-Reply-To: <1384257045-15524-1-git-send-email-oscar.mateo@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: Oscar Mateo 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 --- 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