From patchwork Thu Jan 29 15:27:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 5743501 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 286C7BF440 for ; Thu, 29 Jan 2015 15:27:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56DCA20117 for ; Thu, 29 Jan 2015 15:27:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 01CD52024C for ; Thu, 29 Jan 2015 15:27:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 44F797A004; Thu, 29 Jan 2015 07:27:46 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by gabe.freedesktop.org (Postfix) with ESMTP id D181A7A004 for ; Thu, 29 Jan 2015 07:27:44 -0800 (PST) Received: by mail-we0-f174.google.com with SMTP id w55so18319643wes.5 for ; Thu, 29 Jan 2015 07:27:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XhsjSLZSkSyHP9S7MHaB6ch8iFIM/DLF9/nLqTe/I7w=; b=Mahnad0VHVGxtUwyo68yQFkFCBbxfUOHI0VOdRPxmJa2DSuLNGKTqBs0gz9HuUOaYe dpbLxa7qXYokx4yrv1bCCh0L84rrUzzCSjEmYkrwwqOJUoXNDJuyyXGUuD/gMDJL1ht8 RKhasyoPv6J+iHJirSBLDIXr6a2KdAooCs4eYYnBYQJkSQxYZTgRYGvnFwtVh4C2aNVz mjMJmsHj2LenF4WChXg13z+N5XUFXazHmSbfSNFHD8v1tKpE08D45grWG79R5pTzULTx vdvzp3ajsIPTzfNigwapSerh7OfU3hcQ1QniLF/h4gal+W7pCY1+bt6mTQadiBlBjOYv AnRw== X-Received: by 10.194.76.73 with SMTP id i9mr1960461wjw.93.1422545263386; Thu, 29 Jan 2015 07:27:43 -0800 (PST) Received: from arch-laptop.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by mx.google.com with ESMTPSA id er13sm10894145wjc.11.2015.01.29.07.27.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jan 2015 07:27:42 -0800 (PST) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH 04.1/11] SQUASH: tests: misc cleanups Date: Thu, 29 Jan 2015 15:27:21 +0000 Message-Id: <1422545241-2861-1-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1422029304-1926-5-git-send-email-thierry.reding@gmail.com> References: <1422029304-1926-5-git-send-email-thierry.reding@gmail.com> Cc: emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_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 Cairo - Add cflags only when needed (tests/util). - Leave the link against cairo for the final object, not the static library. - Use Makefile.sources for the sources list. - Drop unused includes Signed-off-by: Emil Velikov --- tests/modetest/Makefile.am | 1 - tests/modetest/buffers.c | 5 ----- tests/util/Makefile.am | 12 +++--------- tests/util/Makefile.sources | 6 ++++++ 4 files changed, 9 insertions(+), 15 deletions(-) create mode 100644 tests/util/Makefile.sources diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am index 88fde2e..40dad3e 100644 --- a/tests/modetest/Makefile.am +++ b/tests/modetest/Makefile.am @@ -23,7 +23,6 @@ modetest_LDADD = \ -lpthread if HAVE_CAIRO -AM_CFLAGS += $(CAIRO_CFLAGS) modetest_LDADD += $(CAIRO_LIBS) endif diff --git a/tests/modetest/buffers.c b/tests/modetest/buffers.c index 4db4e9a..2db538c 100644 --- a/tests/modetest/buffers.c +++ b/tests/modetest/buffers.c @@ -44,11 +44,6 @@ #include "buffers.h" -#ifdef HAVE_CAIRO -#include -#include -#endif - struct bo { int fd; diff --git a/tests/util/Makefile.am b/tests/util/Makefile.am index 1a2519f..f8e0b17 100644 --- a/tests/util/Makefile.am +++ b/tests/util/Makefile.am @@ -1,3 +1,5 @@ +include Makefile.sources + noinst_LTLIBRARIES = \ libutil.la @@ -8,12 +10,4 @@ libutil_la_CPPFLAGS = \ libutil_la_CFLAGS = \ $(CAIRO_CFLAGS) -libutil_la_SOURCES = \ - common.h \ - format.c \ - format.h \ - pattern.c \ - pattern.h - -libutil_la_LIBADD = \ - $(CAIRO_LIBS) +libutil_la_SOURCES = $(UTIL_FILES) diff --git a/tests/util/Makefile.sources b/tests/util/Makefile.sources new file mode 100644 index 0000000..e91fa72 --- /dev/null +++ b/tests/util/Makefile.sources @@ -0,0 +1,6 @@ +UTIL_FILES := \ + common.h \ + format.c \ + format.h \ + pattern.c \ + pattern.h