[PATCH intel-gpu-tools v2 2/6] Benchmark: use correct src and build location

[Gaetan Nadon]

Headers are found under top_srcdir/...
Haeders are CPP flags, not C Flags
AM_CPPFLAGS, AM_CFLAGS and LDAAD apply to all targets.
libintel_tools.la is located in top_builddir.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 benchmarks/Makefile.am |   29 ++++++++---------------------
 1 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index bc0a533..a80a2f6 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -1,23 +1,10 @@
-NULL=#
 
-bin_PROGRAMS = $(NULL)
+bin_PROGRAMS = 				\
+	intel_upload_blit_large		\
+	intel_upload_blit_large_gtt	\
+	intel_upload_blit_large_map	\
+	intel_upload_blit_small
 
-bin_PROGRAMS += \
-		intel_upload_blit_large \
-		intel_upload_blit_large_gtt \
-		intel_upload_blit_large_map \
-		intel_upload_blit_small \
-		$(NULL)
-
-BENCHMARK_LIBS = \
-	../lib/libintel_tools.la \
-	$(DRM_LIBS)
-
-intel_upload_blit_large_LDADD = $(BENCHMARK_LIBS)
-intel_upload_blit_large_gtt_LDADD = $(BENCHMARK_LIBS)
-intel_upload_blit_large_map_LDADD = $(BENCHMARK_LIBS)
-intel_upload_blit_small_LDADD = $(BENCHMARK_LIBS)
-
-AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
-	-I$(srcdir)/.. \
-	-I$(srcdir)/../lib
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
+AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS)
+LDADD = $(top_builddir)/lib/libintel_tools.la $(DRM_LIBS)
-- 
1.7.5.4