[Intel-gfx] [PATCH i-g-t] tools/Makefile.sources: fix igt_stats complie error on android

2015-07-23 Thread Derek Morton
There are two versions of igt_stats.c in tools and lib\tests
which causes the build system to have two build modules with
the same name.
This patch specifies a different target name for the tool so
there is no clash.

Signed-off-by: Derek Morton 
---
 tools/Makefile.sources | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index 8ca9351..d19ef96 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -5,7 +5,7 @@ noinst_PROGRAMS = \
$(NULL)
 
 bin_PROGRAMS = \
-   igt_stats   \
+   igt_statistics  \
intel_audio_dump\
intel_reg   \
intel_backlight \
@@ -63,3 +63,9 @@ intel_l3_parity_SOURCES = \
intel_l3_parity.h   \
intel_l3_udev_listener.c
 
+# Android does not like building multiple targets with the same name
+# tools/igt_stats.c clashes with lib/tests/igt_stats.c. Simplest fix is to
+# specify a different target name here.
+igt_statistics_SOURCES =   \
+   igt_stats.c
+
-- 
1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx


Re: [Intel-gfx] [PATCH i-g-t] tools/Makefile.sources: fix igt_stats complie error on android

2015-07-24 Thread Morton, Derek J
Found a simpler way of doing this using 'LOCAL_MODULE'. Will prepare a 
replacement patch.

//Derek

>
>
>-Original Message-
>From: Morton, Derek J 
>Sent: Thursday, July 23, 2015 1:59 PM
>To: intel-gfx@lists.freedesktop.org
>Cc: Wood, Thomas; Gore, Tim; Morton, Derek J
>Subject: [PATCH i-g-t] tools/Makefile.sources: fix igt_stats complie error on 
>android
>
>There are two versions of igt_stats.c in tools and lib\tests which causes the 
>build system to have two build modules with the same name.
>This patch specifies a different target name for the tool so there is no clash.
>
>Signed-off-by: Derek Morton 
>---
> tools/Makefile.sources | 8 +++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/tools/Makefile.sources b/tools/Makefile.sources index 
>8ca9351..d19ef96 100644
>--- a/tools/Makefile.sources
>+++ b/tools/Makefile.sources
>@@ -5,7 +5,7 @@ noinst_PROGRAMS = \
>   $(NULL)
> 
> bin_PROGRAMS =\
>-  igt_stats   \
>+  igt_statistics  \
>   intel_audio_dump\
>   intel_reg   \
>   intel_backlight \
>@@ -63,3 +63,9 @@ intel_l3_parity_SOURCES =\
>   intel_l3_parity.h   \
>   intel_l3_udev_listener.c
> 
>+# Android does not like building multiple targets with the same name # 
>+tools/igt_stats.c clashes with lib/tests/igt_stats.c. Simplest fix is 
>+to # specify a different target name here.
>+igt_statistics_SOURCES =  \
>+  igt_stats.c
>+
>--
>1.9.1
>
>
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx