[Intel-gfx] [PACTH i-g-t v4 09/13] demos/Makefile: Replace automake specific name of listing in Makfile.sources

robert.foss at collabora.com robert.foss at collabora.com
Thu Jun 23 09:34:24 UTC 2016


From: Robert Foss <robert.foss at collabora.com>

Replace the automake specific name of listings in Makefile.sources
with something not automake specific.

Signed-off-by: Robert Foss <robert.foss at collabora.com>
---
 demos/Android.mk       | 2 +-
 demos/Makefile.am      | 2 ++
 demos/Makefile.sources | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/demos/Android.mk b/demos/Android.mk
index add2414..90d8b37 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 48eb6c2..fe0ff1f 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 302f6d9..31f7f83 100644
--- a/demos/Makefile.sources
+++ b/demos/Makefile.sources
@@ -1,4 +1,4 @@
-bin_PROGRAMS =			\
+demos_prog_list =		\
 	$(NULL)
 
 HAVE_LIBDRM_INTEL_BIN =		\
-- 
2.7.4



More information about the Intel-gfx mailing list