build: Make ChangeLog generation distcheck-safe

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 10b2d03b94d39452118b8f17c0d4420cd1f6c2b8..2a0825d35295e8d1cb6fcb5998fb16b422af1031 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,8 +174,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 += \
@@ -590,7 +591,7 @@ PDIR = bindings/python
 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)
 
@@ -702,11 +703,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