build: Skip Python bindings during distcheck

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cd21a6884afa6731df1485cabe45577c77b15af7..6d5fb2b8aeece254732a6b786b43ceef2236c67e 100644 (file)
--- 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
@@ -496,6 +500,7 @@ EXTRA_DIST = \
        bindings/java/org/sigrok/core/interfaces/LogCallback.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 \
@@ -703,11 +708,16 @@ all-local: $(BUILD_EXTRA)
 install-exec-local: $(INSTALL_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