X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2FMakefile.am;h=874b9e1beff7ee68595166453c48b21f990fe437;hb=2c2be401897895c0a343dfd461adcfffbee950a6;hp=e8d670ce28733a704dbb40259a3b44a9b8e9b939;hpb=28b9dd18611da8e16038d62d58195bdef91552eb;p=libsigrok.git diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am index e8d670ce..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 NEED_EZUSB -libsigrokhwcommon_la_SOURCES += ezusb.c +if NEED_USB +libsigrokhwcommon_la_SOURCES += ezusb.c usb.c endif -if NEED_SERIAL -libsigrokhwcommon_la_SOURCES += serial.c -endif +libsigrokhwcommon_la_LIBADD = dmm/libsigrok_hw_common_dmm.la libsigrokhwcommon_la_CFLAGS = \ -I$(top_srcdir)