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
Cc: intel-gfx@lists.freedesktop.org
Subject: [RFC i-g-t 3/9] tools/Makefile: Don't build tools that depend on libdrm_intel.
Date: Fri, 20 May 2016 18:59:27 -0400 [thread overview]
Message-ID: <1463785173-17557-4-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <1463785173-17557-1-git-send-email-robert.foss@collabora.com>
From: Robert Foss <robert.foss@collabora.com>
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 <robert.foss@collabora.com>
---
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
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-05-20 22:59 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-20 22:59 [RFC i-g-t 0/9] Remove compile time depencencies on libdrm_intel robert.foss
2016-05-20 22:59 ` [RFC i-g-t 1/9] configure.ac: Test for libdrm_intel and build for it if present robert.foss
2016-05-21 7:55 ` Chris Wilson
2016-05-21 13:15 ` Robert Foss
2016-05-23 15:03 ` ?==?utf-8?q? ?==?utf-8?q? [RFC i-g-t 1/9]?==?utf-8?q? " Emil Velikov
2016-05-24 14:58 ` [RFC i-g-t 1/9] " Robert Foss
2016-05-20 22:59 ` [RFC i-g-t 2/9] benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel robert.foss
2016-05-23 14:04 ` ?==?utf-8?q? " Emil Velikov
2016-05-24 8:01 ` Daniel Vetter
2016-05-25 17:47 ` Robert Foss
2016-05-20 22:59 ` robert.foss [this message]
2016-05-23 14:09 ` ?==?utf-8?q? [RFC i-g-t 3/9] tools/Makefile: Don't build tools " Emil Velikov
2016-05-20 22:59 ` [RFC i-g-t 4/9] demos/Makefile: " robert.foss
2016-05-20 22:59 ` [RFC i-g-t 5/9] tests/gem_ppgtt: Switched to new aliases of intel specific functions robert.foss
2016-05-23 14:14 ` ?==?utf-8?q? " Emil Velikov
2016-05-23 14:15 ` Emil Velikov
2016-05-24 8:03 ` Daniel Vetter
2016-05-20 22:59 ` [RFC i-g-t 6/9] tests/gem_render_tiled_blits: " robert.foss
2016-05-23 14:39 ` ?==?utf-8?q? " Emil Velikov
2016-05-24 8:04 ` Daniel Vetter
2016-05-20 22:59 ` [RFC i-g-t 7/9] lib/intel_drm_stubs: Add stubs for functionality from libdrm_intel robert.foss
2016-05-23 14:53 ` ?==?utf-8?q? " Emil Velikov
2016-05-24 8:05 ` Daniel Vetter
2016-05-25 17:48 ` Robert Foss
2016-05-20 22:59 ` [RFC i-g-t 8/9] lib: Replace intel specific header includes with intel_drm_stubs.h robert.foss
2016-05-23 14:57 ` ?==?utf-8?q? " Emil Velikov
2016-05-24 8:07 ` Daniel Vetter
2016-05-25 18:00 ` Robert Foss
2016-05-20 22:59 ` [RFC i-g-t 9/9] tests: " robert.foss
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=1463785173-17557-4-git-send-email-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=daniel.stone@collabora.com \
--cc=daniel.vetter@ffwll.ch \
--cc=emil.velikov@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=marius.c.vlad@intel.com \
--cc=tomeu.vizoso@collabora.com \
/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.