README: Update prebuilt firmware download location.

[sigrok-firmware-fx2lafw.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 19f4388eb8f39ff78dbdbdf8375b92d891b6a802..4d859b15409b2c06b18d6e99935524261ebf51e1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -214,11 +214,23 @@ firmwaredir = $(datadir)/sigrok-firmware
 firmware_DATA = $(firmware_binaries)
 
 dist_noinst_DATA = $(fx2lafw_headers) $(fx2lafw_sources) $(fx2lib_headers) $(fx2lib_sources) $(fx2lib_ints_sources) $(hw_sources)
+dist_noinst_SCRIPTS = autogen.sh
 
 MOSTLYCLEANFILES = *.asm fx2lib/lib/*.asm fx2lib/lib/*.lib fx2lib/lib/interrupts/*.asm fx2lib/lib/interrupts/*.lib
 CLEANFILES = $(firmware_binaries)
 DISTCLEANFILES = $(dirstamps)
 
+# Custom silent rules prefixes
+SF_V_SDAS = $(sf_v_SDAS_@AM_V@)
+sf_v_SDAS_ = $(sf_v_SDAS_@AM_DEFAULT_V@)
+sf_v_SDAS_0 = @echo "  SDAS    " $@;
+sf_v_SDAS_1 =
+
+SF_V_SDCC = $(sf_v_SDCC_@AM_V@)
+sf_v_SDCC_ = $(sf_v_SDCC_@AM_DEFAULT_V@)
+sf_v_SDCC_0 = @echo "  SDCC    " $@;
+sf_v_SDCC_1 =
+
 .PHONY: dist-bin dist-changelog
 
 all-local: $(firmware_binaries)
@@ -232,21 +244,22 @@ mostlyclean-local:
 dist-hook: dist-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
+       $(AM_V_at)if test -d '$(top_srcdir)/.git'; then \
+               if git -C '$(top_srcdir)' log >.ChangeLog.tmp; \
+               then mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
+               else rm -f .ChangeLog.tmp; exit 1; fi; \
+       else :; fi
 
 # Creates a convenience tarball with just the generated *.fw files, so that
 # the users don't have to build them manually.
 dist-bin: $(firmware_binaries)
+       -$(AM_V_at)rm -fr $(distdir_bin)
        $(AM_V_at)$(MKDIR_P) $(distdir_bin)
        $(AM_V_at)$(INSTALL_DATA) $(firmware_binaries) $(distdir_bin)
        $(AM_V_at)$(INSTALL_DATA) $(srcdir)/COPYING $(srcdir)/COPYING.LESSER $(srcdir)/NEWS $(srcdir)/README $(distdir_bin)
-       $(AM_V_at)git -C '$(top_srcdir)' log > $(distdir_bin)/ChangeLog
+       $(AM_V_at)if test -d '$(top_srcdir)/.git'; \
+       then git -C '$(top_srcdir)' log > $(distdir_bin)/ChangeLog; \
+       else $(INSTALL_DATA) $(srcdir)/ChangeLog $(distdir_bin); fi
        $(AM_V_at)tar -czf $(distdir_bin).tar.gz $(distdir_bin)
        -$(AM_V_at)rm -fr $(distdir_bin)
 
@@ -302,10 +315,10 @@ hw/sigrok-fx2-16ch/fx2lafw-sigrok-fx2-16ch.ihx: hw/sigrok-fx2-16ch/dscr.rel $(fx
        $(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS) -o $@ hw/sigrok-fx2-16ch/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
 
 .a51.rel:
-       $(AM_V_GEN)$(SDAS8051) -glos $(as_includes) $@ $<
+       $(SF_V_SDAS)$(SDAS8051) -glos $(as_includes) $@ $<
 
 .c.rel:
-       $(AM_V_GEN)$(SDCC) -mmcs51 $(c_includes) -c $< -o $@
+       $(SF_V_SDCC)$(SDCC) -mmcs51 $(c_includes) -c $< -o $@
 
 if FOUND_OBJCOPY
 .ihx.fw: