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

diff --git a/Makefile.am b/Makefile.am
index 582b38f7..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.
@@ -98,6 +101,7 @@ libsigrok_la_SOURCES += \
 
 # SCPI support
 libsigrok_la_SOURCES += \
+	src/scpi.h \
 	src/scpi/scpi.c \
 	src/scpi/helpers.c \
 	src/scpi/scpi_tcp.c
@@ -147,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
@@ -174,8 +179,9 @@ libsigrok_la_SOURCES += \
 endif
 if HW_ASIX_SIGMA
 libsigrok_la_SOURCES += \
-	src/hardware/asix-sigma/asix-sigma.h \
-	src/hardware/asix-sigma/asix-sigma.c
+	src/hardware/asix-sigma/protocol.h \
+	src/hardware/asix-sigma/protocol.c \
+	src/hardware/asix-sigma/api.c
 endif
 if HW_ATTEN_PPS3XXX
 libsigrok_la_SOURCES += \
@@ -317,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 += \
@@ -400,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
@@ -493,9 +501,9 @@ EXTRA_DIST = \
 	bindings/java/org/sigrok/core/classes/classes.i \
 	bindings/java/org/sigrok/core/interfaces/DatafeedCallback.java \
 	bindings/java/org/sigrok/core/interfaces/LogCallback.java \
-	bindings/java/org/sigrok/core/interfaces/SourceCallback.java \
 	bindings/swig/classes.i \
 	bindings/swig/doc.py \
+	bindings/swig/templates.i \
 	contrib/gnuplot_chronovu_la8.gpi \
 	contrib/gnuplot_rigol_ds1xx2.gpi \
 	contrib/gnuplot_usbeesx.gpi \
@@ -531,6 +539,7 @@ tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
 
 BUILD_EXTRA =
 INSTALL_EXTRA =
+UNINSTALL_EXTRA =
 CLEAN_EXTRA =
 
 if BINDINGS_CXX
@@ -568,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
@@ -582,29 +592,39 @@ $(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
 		bindings/cxx/enums.timestamp
 	$(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null
 
+# Macro definitions to be used by the SWIG parser.
+swig_defs = -Dnoexcept= -Dprivate=protected -DG_GNUC_BEGIN_IGNORE_DEPRECATIONS= -DG_GNUC_END_IGNORE_DEPRECATIONS=
+
 if BINDINGS_PYTHON
 
 PDIR = bindings/python
-PDOC = bindings/python/sigrok/core/doc.i
+PDOC_START = bindings/python/sigrok/core/doc_start.i
+PDOC_END = bindings/python/sigrok/core/doc_end.i
 
-setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)'
+setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' CXXFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)'
 setup_quiet = --quiet
 setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet)
 
-$(PDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+$(PDOC_START): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+	$(AM_V_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py python $(CPPXMLDOC) start > $@
+
+$(PDOC_END): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
 	$(AM_V_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py python $(CPPXMLDOC) > $@
+	$(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py python $(CPPXMLDOC) end > $@
 
 python-build: $(PDIR)/timestamp
 
 $(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
-		bindings/swig/classes.i bindings/swig/enums.i $(PDOC) \
-		$(library_include_HEADERS) $(nodist_library_include_HEADERS) \
+		bindings/swig/classes.i bindings/swig/templates.i \
+		bindings/swig/enums.i $(PDOC_START) $(PDOC_END) \
+		$(library_include_HEADERS) \
+		$(nodist_library_include_HEADERS) \
 		$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		$(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		@ORDER@ bindings/cxx/libsigrokcxx.la
 	$(AM_V_at)$(setup_py) clean --all 2>/dev/null
-	$(AM_V_GEN)$(setup_py) build_ext --swig "$(SWIG)" build_py
+	$(AM_V_GEN)$(setup_py) build_ext --swig "$(SWIG)" --swig-opts '$(swig_defs)' build_py
 	$(AM_V_at): >$@
 
 python-install:
@@ -647,11 +667,13 @@ $(JDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
 	$(AM_V_at)test -d $(JCLS) || $(MKDIR_P) $(JCLS)
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py java $(CPPXMLDOC) > $@
 
-$(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i \
+$(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i \
+		bindings/swig/templates.i bindings/swig/enums.i \
 		$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		$(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS)
 	-$(AM_V_at)rm -f $(java_cleanfiles)
-	$(AM_V_GEN)$(SWIG) -c++ -Dnoexcept= -java -package org.sigrok.core.classes \
+	$(AM_V_GEN)$(SWIG) -c++ $(swig_defs) \
+		-java -package org.sigrok.core.classes \
 		-Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \
 		-outdir $(JCLS) -o $@ $(srcdir)/$(JSWG)
 
@@ -670,12 +692,16 @@ $(JLIB): $(JCXX) \
 
 java-install:
 	$(INSTALL) -d $(DESTDIR)$(libdir)/jni
-	$(INSTALL) $(JLIB) -t $(DESTDIR)$(libdir)/jni
+	$(INSTALL) $(JLIB) $(DESTDIR)$(libdir)/jni
 	$(INSTALL) -d $(DESTDIR)$(datadir)/java
-	$(INSTALL) $(JJAR) -t $(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:
@@ -683,19 +709,26 @@ 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)
 
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: dist-changelog
 
-.PHONY: ChangeLog
-ChangeLog:
-	git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@
+dist-hook: dist-changelog
 
-dist-hook: ChangeLog
+dist-changelog:
+	$(AM_V_at)if test ! -d '$(top_srcdir)/.git'; then \
+		cp -f '$(top_srcdir)/ChangeLog' "$(top_distdir)/ChangeLog"; \
+	elif git -C '$(top_srcdir)' log >.ChangeLog.tmp; then \
+		mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
+	else \
+		rm -f .ChangeLog.tmp; exit 1; \
+	fi