From patchwork Tue Nov 12 11:50:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: oscar.mateo@intel.com X-Patchwork-Id: 3171571 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 196A9C045B for ; Tue, 12 Nov 2013 10:54:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA0F82037F for ; Tue, 12 Nov 2013 10:54:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D3AD32024D for ; Tue, 12 Nov 2013 10:54:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 980D2FA930; Tue, 12 Nov 2013 02:54:11 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 12 Nov 2013 02:54:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,535,1378882800"; d="scan'208";a="433802884" Received: from omateolo-linux2.isw.intel.com ([10.102.226.43]) by orsmga002.jf.intel.com with ESMTP; 12 Nov 2013 02:54:08 -0800 From: oscar.mateo@intel.com To: intel-gfx@lists.freedesktop.org Date: Tue, 12 Nov 2013 11:50:37 +0000 Message-Id: <1384257045-15524-4-git-send-email-oscar.mateo@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1384257045-15524-1-git-send-email-oscar.mateo@intel.com> References: <1384257045-15524-1-git-send-email-oscar.mateo@intel.com> Subject: [Intel-gfx] [PATCH v2 03/11] build: Move logic to tests/Makefile.am and away from Makefile.sources X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 \