From patchwork Fri May 20 22:59:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9130151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C30860762 for ; Fri, 20 May 2016 22:59:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DBAA27C23 for ; Fri, 20 May 2016 22:59:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7FB2727CC9; Fri, 20 May 2016 22:59:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4894C27C23 for ; Fri, 20 May 2016 22:59:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4AED06EB23; Fri, 20 May 2016 22:59:54 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F0626E347 for ; Fri, 20 May 2016 22:59:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 7B2372654E9 From: robert.foss@collabora.com To: daniel.vetter@ffwll.ch, daniel.stone@collabora.com, marius.c.vlad@intel.com, tomeu.vizoso@collabora.com, emil.velikov@collabora.com Date: Fri, 20 May 2016 18:59:27 -0400 Message-Id: <1463785173-17557-4-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1463785173-17557-1-git-send-email-robert.foss@collabora.com> References: <1463785173-17557-1-git-send-email-robert.foss@collabora.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [RFC i-g-t 3/9] tools/Makefile: Don't build tools that depend on libdrm_intel. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Robert Foss Use the HAS_INTEL automake flag to avoid building tools that won't compile unless libdrm_intel is available in the build system. Signed-off-by: Robert Foss --- tools/Makefile.sources | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/tools/Makefile.sources b/tools/Makefile.sources index 5d5958d..c2dab8e 100644 --- a/tools/Makefile.sources +++ b/tools/Makefile.sources @@ -1,42 +1,54 @@ -noinst_PROGRAMS = \ - hsw_compute_wrpll \ - skl_compute_wrpll \ - skl_ddb_allocation \ +noinst_PROGRAMS = \ + hsw_compute_wrpll \ + skl_compute_wrpll \ + skl_ddb_allocation \ $(NULL) -bin_PROGRAMS = \ +bin_PROGRAMS = \ igt_stats \ - intel_audio_dump \ + intel_audio_dump \ intel_reg \ intel_backlight \ intel_bios_dumper \ intel_bios_reader \ intel_display_crc \ intel_display_poller \ - intel_dump_decode \ - intel_error_decode \ intel_forcewaked \ intel_gpu_frequency \ - intel_framebuffer_dump \ intel_firmware_decode \ - intel_gpu_time \ - intel_gpu_top \ - intel_gtt \ + intel_gpu_time \ + intel_gpu_top \ + intel_gtt \ intel_infoframes \ intel_l3_parity \ intel_lid \ intel_opregion_decode \ intel_panel_fitter \ - intel_perf_counters \ - intel_reg_checker \ + intel_reg_checker \ intel_residency \ - intel_stepping \ + intel_stepping \ intel_watermark dist_bin_SCRIPTS = intel_gpu_abrt -intel_dump_decode_SOURCES = \ - intel_dump_decode.c +if HAVE_INTEL + bin_PROGRAMS += \ + intel_dump_decode \ + intel_error_decode \ + intel_framebuffer_dump \ + intel_perf_counters \ + $(NULL) + + intel_dump_decode_SOURCES = \ + intel_dump_decode.c \ + $(NULL) + + intel_error_decode_SOURCES = \ + intel_error_decode.c \ + $(NULL) + + intel_error_decode_LDFLAGS = -lz +endif intel_reg_SOURCES = \ intel_reg.c \ @@ -44,10 +56,6 @@ intel_reg_SOURCES = \ intel_reg_spec.c \ intel_reg_spec.h -intel_error_decode_SOURCES = \ - intel_error_decode.c -intel_error_decode_LDFLAGS = -lz - intel_bios_reader_SOURCES = \ intel_bios_reader.c \ intel_bios.h