diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/gallium/Automake.inc | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b68b51e94a4..450fca161ac 100644 --- a/configure.ac +++ b/configure.ac @@ -1127,11 +1127,11 @@ AC_ARG_ENABLE([lmsensors], AM_CONDITIONAL(HAVE_LIBSENSORS, test "x$enable_lmsensors" = xyes) if test "x$enable_lmsensors" = xyes ; then DEFINES="${DEFINES} -DHAVE_LIBSENSORS=1" - LIBSENSORS_LDFLAGS="-lsensors" + LIBSENSORS_LIBS="-lsensors" else - LIBSENSORS_LDFLAGS="" + LIBSENSORS_LIBS="" fi -AC_SUBST(LIBSENSORS_LDFLAGS) +AC_SUBST(LIBSENSORS_LIBS) case "$host_os" in linux*) diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index 6aadcb91983..a01fa540531 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -46,6 +46,7 @@ GALLIUM_TARGET_CFLAGS = \ GALLIUM_COMMON_LIB_DEPS = \ -lm \ + $(LIBSENSORS_LIBS) \ $(CLOCK_LIB) \ $(PTHREAD_LIBS) \ $(DLOPEN_LIBS) diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 1154c791311..def00980308 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -44,8 +44,6 @@ libgallium_la_SOURCES += \ endif -libgallium_la_LDFLAGS = $(LIBSENSORS_LDFLAGS) - MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) |