X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=4ed41bf7b63e500de698162f0d4d0cd78c2a9172;hb=16fc7ee29ffa196d29a20fddd81234792f88b12c;hp=1c92bda12de70f94b048bb790833d49ace694ddc;hpb=0a9d05dc7cf555fb29be0780b8274bdec34956e5;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 1c92bda1..4ed41bf7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,9 @@ ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --silent
 GNUMAKEFLAGS = --no-print-directory
 
+# distutils/setuptools cause trouble on distcheck. Disable for now.
+DISTCHECK_CONFIGURE_FLAGS = --disable-python
+
 FIRMWARE_DIR = $(datadir)/sigrok-firmware
 
 local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I.
@@ -148,7 +151,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
@@ -319,11 +323,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 += \
@@ -402,6 +406,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
@@ -533,6 +539,7 @@ tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
 
 BUILD_EXTRA =
 INSTALL_EXTRA =
+UNINSTALL_EXTRA =
 CLEAN_EXTRA =
 
 if BINDINGS_CXX
@@ -570,6 +577,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
@@ -688,8 +696,12 @@ java-install:
 	$(INSTALL) -d $(DESTDIR)$(datadir)/java
 	$(INSTALL) $(JJAR) $(DESTDIR)$(datadir)/java
 
+java-uninstall:
+	-rm -f $(DESTDIR)$(datadir)/java/sigrok-core.jar
+	-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:
@@ -697,12 +709,14 @@ java-doc:
 
 BUILD_EXTRA += java-build
 INSTALL_EXTRA += java-install
+UNINSTALL_EXTRA += java-uninstall
 CLEAN_EXTRA += java-clean
 
 endif
 
 all-local: $(BUILD_EXTRA)
 install-exec-local: $(INSTALL_EXTRA)
+uninstall-local: $(UNINSTALL_EXTRA)
 clean-local: $(CLEAN_EXTRA)
 
 .PHONY: dist-changelog