Restore number "categories" in sr_configkey.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3a2b5c3b81c78d6373f5f4b1ecf8577fe4784b35..882abb951e8be9125a930231c5106025638ec11d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,8 @@ libsigrok_la_SOURCES += \
        src/input/binary.c \
        src/input/chronovu_la8.c \
        src/input/csv.c \
+       src/input/raw_analog.c \
+       src/input/trace32_ad.c \
        src/input/vcd.c \
        src/input/wav.c
 
@@ -151,7 +153,8 @@ libsigrok_la_SOURCES += \
        src/dmm/bm25x.c \
        src/dmm/ut71x.c \
        src/dmm/ut372.c \
-       src/dmm/vc870.c
+       src/dmm/vc870.c \
+       src/dmm/dtm0660.c
 
 # Hardware (LCR chip parsers)
 if NEED_SERIAL
@@ -322,11 +325,11 @@ libsigrok_la_SOURCES += \
        src/hardware/kern-scale/protocol.c \
        src/hardware/kern-scale/api.c
 endif
-if HW_KORAD_KDXXXXP
+if HW_KORAD_KAXXXXP
 libsigrok_la_SOURCES += \
-       src/hardware/korad-kdxxxxp/protocol.h \
-       src/hardware/korad-kdxxxxp/protocol.c \
-       src/hardware/korad-kdxxxxp/api.c
+       src/hardware/korad-kaxxxxp/protocol.h \
+       src/hardware/korad-kaxxxxp/protocol.c \
+       src/hardware/korad-kaxxxxp/api.c
 endif
 if HW_LASCAR_EL_USB
 libsigrok_la_SOURCES += \
@@ -334,6 +337,12 @@ libsigrok_la_SOURCES += \
        src/hardware/lascar-el-usb/protocol.c \
        src/hardware/lascar-el-usb/api.c
 endif
+if HW_LECROY_LOGICSTUDIO
+libsigrok_la_SOURCES += \
+       src/hardware/lecroy-logicstudio/protocol.h \
+       src/hardware/lecroy-logicstudio/protocol.c \
+       src/hardware/lecroy-logicstudio/api.c
+endif
 if HW_MANSON_HCS_3XXX
 libsigrok_la_SOURCES += \
        src/hardware/manson-hcs-3xxx/protocol.h \
@@ -405,6 +414,8 @@ if HW_SYSCLK_LWLA
 libsigrok_la_SOURCES += \
        src/hardware/sysclk-lwla/lwla.h \
        src/hardware/sysclk-lwla/lwla.c \
+       src/hardware/sysclk-lwla/lwla1016.c \
+       src/hardware/sysclk-lwla/lwla1034.c \
        src/hardware/sysclk-lwla/protocol.h \
        src/hardware/sysclk-lwla/protocol.c \
        src/hardware/sysclk-lwla/api.c
@@ -574,6 +585,7 @@ bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \
 cxx-clean:
        rm -rf doxy/
        rm -rf bindings/cxx/doxy/
+       rm -f bindings/swig/enums.i
        rm -f bindings/cxx/enums.cpp
        rm -f bindings/cxx/include/libsigrokcxx/enums.hpp
        rm -f bindings/cxx/enums.timestamp
@@ -697,7 +709,7 @@ java-uninstall:
        -rm -f $(DESTDIR)$(libdir)/jni/libsigrok_java_core_classes.so
 
 java-clean:
-       -$(AM_V_at)rm -f $(java_cleanfiles)
+       -$(AM_V_at)rm -f $(java_cleanfiles) $(JDOC)
        -$(AM_V_at)rm -fr $(JDIR)/doxy
 
 java-doc: