kingst-la2016: Eliminate non-portable packed structs for USB transfer layout

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 88bf1eb988d53dd26dadabe0dbf8b390e4bfb238..1f51684f446e3be2734685b881f20de7c63e3907 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-python
 
 FIRMWARE_DIR = $(datadir)/sigrok-firmware
 
-local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I.
+local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. @RPC_CFLAGS@
 if BINDINGS_CXX
 local_includes += -Ibindings/cxx/include -I$(srcdir)/bindings/cxx/include -Ibindings/cxx
 endif
@@ -166,6 +166,7 @@ libsigrok_la_SOURCES += \
        src/dmm/asycii.c \
        src/dmm/bm25x.c \
        src/dmm/bm52x.c \
+       src/dmm/bm85x.c \
        src/dmm/bm86x.c \
        src/dmm/dtm0660.c \
        src/dmm/eev121gw.c \
@@ -174,6 +175,7 @@ libsigrok_la_SOURCES += \
        src/dmm/fs9922.c \
        src/dmm/m2110.c \
        src/dmm/metex14.c \
+       src/dmm/mm38xr.c \
        src/dmm/ms2115b.c \
        src/dmm/ms8250d.c \
        src/dmm/rs9lcd.c \
@@ -259,13 +261,6 @@ src_libdrivers_la_SOURCES += \
        src/hardware/beaglelogic/beaglelogic_native.c \
        src/hardware/beaglelogic/beaglelogic_tcp.c
 endif
-if HW_BRYMEN_DMM
-src_libdrivers_la_SOURCES += \
-       src/hardware/brymen-dmm/parser.c \
-       src/hardware/brymen-dmm/protocol.h \
-       src/hardware/brymen-dmm/protocol.c \
-       src/hardware/brymen-dmm/api.c
-endif
 if HW_CEM_DT_885X
 src_libdrivers_la_SOURCES += \
        src/hardware/cem-dt-885x/protocol.h \