diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2019-03-01 10:25:58 +0000 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2019-03-04 07:01:17 +0000 |
| commit | a958d3f60b7718151fd0bafcdd1e4874262f51b8 (patch) | |
| tree | 1d4145b78196e4734d8d00419d21d569b49a5f33 | |
| parent | a117a5b819a76894fcee02a7cc134aa2b1249c78 (diff) | |
automake: Make librt mandatory
librt is required by libintel_tools so express it as mandatory in autoconf
and also drop explicit mentions from Makefile.am.
This also fixes a build warning of:
tests/Makefile.am:134: warning: variable 'pm_rc6_residency_LDADD' is defined but no program or
tests/Makefile.am:134: library has 'pm_rc6_residency' as canonical name (possible typo)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | benchmarks/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index c166d636..1f05adf3 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -24,5 +24,5 @@ gem_exec_tracer_la_LIBADD = -ldl gem_latency_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) gem_latency_LDADD = $(LDADD) -lpthread gem_syslatency_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) -gem_syslatency_LDADD = $(LDADD) -lpthread -lrt +gem_syslatency_LDADD = $(LDADD) -lpthread gem_wsim_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la -lpthread diff --git a/configure.ac b/configure.ac index e22703d0..a3f541a2 100644 --- a/configure.ac +++ b/configure.ac @@ -58,12 +58,12 @@ AX_GCC_FUNC_ATTRIBUTE([constructor]) dnl Check for POSIX timers AC_CHECK_FUNCS(timer_create, [], [ AC_CHECK_LIB(rt, timer_create, [ - AC_DEFINE(HAVE_TIMER_CREATE, 1) TIMER_LIBS="-lrt" ], [ AC_CHECK_LIB(pthread, timer_create, [ - AC_DEFINE(HAVE_TIMER_CREATE, 1) TIMER_LIBS="-lpthread" + ], [ + AC_MSG_ERROR([Failed to find library containing timer_create.]) ]) ]) ]) diff --git a/tests/Makefile.am b/tests/Makefile.am index c5dd210c..289249b4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -128,10 +128,7 @@ gem_userptr_blits_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) gem_userptr_blits_LDADD = $(LDADD) -lpthread perf_pmu_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la -gem_eio_LDADD = $(LDADD) -lrt -gem_wait_LDADD = $(LDADD) -lrt -kms_flip_LDADD = $(LDADD) -lrt -lpthread -pm_rc6_residency_LDADD = $(LDADD) -lrt +kms_flip_LDADD = $(LDADD) -lpthread prime_nv_test_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_test_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) |