summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Foss <robert.foss@collabora.com>2016-07-27 13:17:43 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-08-04 13:13:05 +0200
commitdc99604fdca78f324af086cce29c1bd25a2addf2 (patch)
tree8ec7b437e5c61f336e1d1568767dcbe2c956cc33
parent6e89ee8f20fddc6621eb5326ae3b7a75faa749b9 (diff)
demos/Makefile: Replace automake specific name of listing in Makfile.sources
Replace the automake specific name of listings in Makefile.sources with something not automake specific. 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>
-rw-r--r--demos/Android.mk2
-rw-r--r--demos/Makefile.am2
-rw-r--r--demos/Makefile.sources2
3 files changed, 4 insertions, 2 deletions
diff --git a/demos/Android.mk b/demos/Android.mk
index add24148..90d8b37d 100644
--- a/demos/Android.mk
+++ b/demos/Android.mk
@@ -4,7 +4,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES :=
+LOCAL_SRC_FILES := $(demos_prog_lists)
ifeq ($(HAVE_LIBDRM_INTEL),true)
LOCAL_SRC_FILES += $(LIBDRM_INTEL_BIN)
diff --git a/demos/Makefile.am b/demos/Makefile.am
index 48eb6c26..fe0ff1ff 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,5 +1,7 @@
include Makefile.sources
+bin_PROGRAMS = $(demos_prog_list)
+
if HAVE_LIBDRM_INTEL
bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
endif
diff --git a/demos/Makefile.sources b/demos/Makefile.sources
index 302f6d95..31f7f83f 100644
--- a/demos/Makefile.sources
+++ b/demos/Makefile.sources
@@ -1,4 +1,4 @@
-bin_PROGRAMS = \
+demos_prog_list = \
$(NULL)
HAVE_LIBDRM_INTEL_BIN = \