X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2FMakefile.am;h=874b9e1beff7ee68595166453c48b21f990fe437;hb=1d166757694b259bbcca205ced91ac69e8a5ef7e;hp=805586c1ad6485e40fe9bfe9a37d681ac42fe4c3;hpb=824b1a8f5cc6073f6d6505d0efa74d67f4da0fb7;p=libsigrok.git diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am index 805586c1..874b9e1b 100644 --- a/hardware/common/Makefile.am +++ b/hardware/common/Makefile.am @@ -17,18 +17,18 @@ ## along with this program. If not, see . ## +SUBDIRS = dmm + # Local lib, this is NOT meant to be installed! noinst_LTLIBRARIES = libsigrokhwcommon.la -libsigrokhwcommon_la_SOURCES = +libsigrokhwcommon_la_SOURCES = serial.c -if LA_FX2LAFW -libsigrokhwcommon_la_SOURCES += ezusb.c +if NEED_USB +libsigrokhwcommon_la_SOURCES += ezusb.c usb.c endif -if LA_OLS -libsigrokhwcommon_la_SOURCES += serial.c -endif +libsigrokhwcommon_la_LIBADD = dmm/libsigrok_hw_common_dmm.la libsigrokhwcommon_la_CFLAGS = \ -I$(top_srcdir)