diff options
author | Gaetan Nadon <memsize@videotron.ca> | 2012-01-05 17:02:30 -0500 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2012-01-12 09:13:08 -0500 |
commit | 3ceb75828ccf813005a7eb4c3924c9ca56c01aa1 (patch) | |
tree | 5b2c79ada8eebaaf03dea4ec5c6122de89980d2a /benchmarks | |
parent | 4768adf7d77706fb6c2967695e0afa7d7c7dbb75 (diff) |
Benchmark: use correct src and build location
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.
Acked-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'benchmarks')
-rw-r--r-- | benchmarks/Makefile.am | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index bc0a533a..a80a2f62 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) |