BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sr: fix conditional build for ezusb and serial helpers

This commit is contained in:
Bert Vermeulen 2012-07-11 12:36:13 +02:00
parent b7e941113f
commit 28b9dd1861
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -247,6 +247,18 @@ if test "x$LA_ALSA" != xno; then
SR_PKGLIBS="$SR_PKGLIBS alsa"]) SR_PKGLIBS="$SR_PKGLIBS alsa"])
fi fi
# EZUSB FX2 firmware helpers only needed for some hardware drivers
AM_CONDITIONAL(NEED_EZUSB, \
test "x$LA_FX2LAFW" != xno \
-o "x$HW_HANTEK_DSO" != xno \
)
# Serial port helpers only needed for some hardware drivers
AM_CONDITIONAL(NEED_SERIAL, \
test "x$LA_OLS" != xno \
-o "x$HW_GENERICDMM" != xno \
)
AC_SUBST(SR_PKGLIBS) AC_SUBST(SR_PKGLIBS)
# Checks for header files. # Checks for header files.

4
hardware/common/Makefile.am
View File

@ -22,11 +22,11 @@ noinst_LTLIBRARIES = libsigrokhwcommon.la
libsigrokhwcommon_la_SOURCES = libsigrokhwcommon_la_SOURCES =
if LA_FX2LAFW if NEED_EZUSB
libsigrokhwcommon_la_SOURCES += ezusb.c libsigrokhwcommon_la_SOURCES += ezusb.c
endif endif
if LA_OLS if NEED_SERIAL
libsigrokhwcommon_la_SOURCES += serial.c libsigrokhwcommon_la_SOURCES += serial.c
endif endif