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, chris@chris-wilson.co.uk
Cc: intel-gfx@lists.freedesktop.org
Subject: [RFC i-g-t 6/7] demos/Makefile: Don't build tools that depend on libdrm_intel.
Date: Wed, 25 May 2016 14:18:55 -0400 [thread overview]
Message-ID: <1464200336-15671-7-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <1464200336-15671-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>
---
demos/Android.mk | 5 ++++-
demos/Makefile.am | 8 +++++---
demos/Makefile.sources | 7 +++++++
3 files changed, 16 insertions(+), 4 deletions(-)
create mode 100644 demos/Makefile.sources
diff --git a/demos/Android.mk b/demos/Android.mk
index 7d06c9a..add2414 100644
--- a/demos/Android.mk
+++ b/demos/Android.mk
@@ -4,8 +4,11 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := intel_sprite_on.c
+LOCAL_SRC_FILES :=
+ifeq ($(HAVE_LIBDRM_INTEL),true)
+ LOCAL_SRC_FILES += $(LIBDRM_INTEL_BIN)
+endif
LOCAL_CFLAGS += -DHAVE_TERMIOS_H
LOCAL_CFLAGS += -DANDROID -UNDEBUG
diff --git a/demos/Makefile.am b/demos/Makefile.am
index f5725f4..48eb6c2 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,6 +1,8 @@
-bin_PROGRAMS = \
- intel_sprite_on \
- $(NULL)
+include Makefile.sources
+
+if HAVE_LIBDRM_INTEL
+ bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
+endif
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
diff --git a/demos/Makefile.sources b/demos/Makefile.sources
new file mode 100644
index 0000000..302f6d9
--- /dev/null
+++ b/demos/Makefile.sources
@@ -0,0 +1,7 @@
+bin_PROGRAMS = \
+ $(NULL)
+
+HAVE_LIBDRM_INTEL_BIN = \
+ intel_sprite_on \
+ $(NULL)
+
--
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-25 18:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 18:18 [RFC i-g-t 0/7] Remove compile time depencencies on libdrm_intel robert.foss
2016-05-25 18:18 ` [RFC i-g-t 1/7] configure.ac: Test for libdrm_intel and build for it if present robert.foss
2016-05-25 21:50 ` Rémi Cardona
2016-05-25 18:18 ` [RFC i-g-t 2/7] configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX robert.foss
2016-05-25 18:18 ` [RFC i-g-t 3/7] benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel robert.foss
2016-05-25 18:18 ` [RFC i-g-t 4/7] tools/Makefile: Don't build tools " robert.foss
2016-05-25 18:18 ` [RFC i-g-t 5/7] tools/Makefile: Format whitespace robert.foss
2016-05-25 18:18 ` robert.foss [this message]
2016-05-25 18:18 ` [RFC i-g-t 7/7] lib/stubs: Add stubs for intel_bufmgr 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=1464200336-15671-7-git-send-email-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=chris@chris-wilson.co.uk \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).