diff options
| author | Robert Foss <robert.foss@collabora.com> | 2016-07-27 13:17:41 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-04 13:13:05 +0200 |
| commit | cd86866dec7ead650a1811259d9207060034482f (patch) | |
| tree | 017219c459ac85efc7778754f2d7f57ba77e64c6 /demos | |
| parent | b8084d2ab3b9114bbdc8bca48bae1db563b7998a (diff) | |
demos/Makefile: Don't build tools that depend on libdrm_intel
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>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/Android.mk | 5 | ||||
| -rw-r--r-- | demos/Makefile.am | 8 | ||||
| -rw-r--r-- | demos/Makefile.sources | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/demos/Android.mk b/demos/Android.mk index 7d06c9af..add24148 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 f5725f4f..48eb6c26 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 00000000..302f6d95 --- /dev/null +++ b/demos/Makefile.sources @@ -0,0 +1,7 @@ +bin_PROGRAMS = \ + $(NULL) + +HAVE_LIBDRM_INTEL_BIN = \ + intel_sprite_on \ + $(NULL) + |