All of lore.kernel.org
 help / color / mirror / Atom feed
From: robert.foss@collabora.com
To: daniel.vetter@ffwll.ch, daniel.stone@collabora.com,
	marius.c.vlad@intel.com, tomeu.vizoso@collabora.com,
	emil.l.velikov@gmail.com, chris@chris-wilson.co.uk
Cc: intel-gfx@lists.freedesktop.org
Subject: [RFC i-g-t v3 07/13] demos/Makefile: Don't build tools that depend on libdrm_intel.
Date: Wed, 15 Jun 2016 05:51:04 -0400	[thread overview]
Message-ID: <1465984270-13918-8-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <1465984270-13918-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

  parent reply	other threads:[~2016-06-15  9:51 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-15  9:50 [RFC i-g-t v3 00/13] Remove compile time depencencies on libdrm_intel robert.foss
2016-06-15  9:50 ` [RFC i-g-t v3 01/13] configure.ac: Test for libdrm_intel and build for it if present robert.foss
2016-06-15  9:50 ` [RFC i-g-t v3 02/13] configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX robert.foss
2016-06-15  9:51 ` [RFC i-g-t v3 03/13] Enable HAVE_LIBDRM_INTEL unconditionally for Android robert.foss
2016-06-15  9:51 ` [RFC i-g-t v3 04/13] benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel robert.foss
2016-06-15  9:51 ` [RFC i-g-t v3 05/13] tools/Makefile: Don't build tools " robert.foss
2016-06-15  9:51 ` [RFC i-g-t v3 06/13] tools/Makefile: Format whitespace robert.foss
2016-06-15  9:51 ` robert.foss [this message]
2016-06-15  9:51 ` [RFC i-g-t v3 08/13] lib/stubs: Add stubs for intel_bufmgr robert.foss
2016-06-20 14:52   ` Emil Velikov
2016-06-21 12:50     ` Marius Vlad
2016-06-21 13:41       ` Emil Velikov
2016-06-21 13:43         ` Emil Velikov
2016-06-22  8:12         ` Daniel Vetter
2016-06-22 10:40           ` Tomeu Vizoso
2016-06-22 11:41             ` Daniel Vetter
2016-06-22 12:46               ` Tomeu Vizoso
2016-06-23  0:39           ` Emil Velikov
2016-06-15  9:51 ` [RFC i-g-t v3 09/13] demos/Makefile: Replace automake specific name of listing in Makfile.sources robert.foss
2016-06-15  9:51 ` [RFC i-g-t v3 10/13] benchmarks/Makefile: " robert.foss
2016-06-15  9:51 ` [RFC i-g-t v3 11/13] tools/Makefile: Replace automake specific name of listings " robert.foss
2016-06-15  9:51 ` [RFC i-g-t v3 12/13] lib/tests/Makefile: Replace automake specific names of listings in Makefile.sources robert.foss
2016-06-15  9:51 ` [RFC i-g-t v3 13/13] lib/Makefile: " robert.foss
2016-06-15 13:12 ` [RFC i-g-t v3 00/13] Remove compile time depencencies on libdrm_intel Chris Wilson

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=1465984270-13918-8-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.l.velikov@gmail.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.