X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=4d859b15409b2c06b18d6e99935524261ebf51e1;hb=05f4369545dad41969b112893a8bb4146e98fc0a;hp=4e02f430cdbd0520709cff7bd1b506361819bc1a;hpb=9a8e9e608edda4dcc6a89a8051a56f302863c938;p=sigrok-firmware-fx2lafw.git

diff --git a/Makefile.am b/Makefile.am
index 4e02f430..4d859b15 100644
--- 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)
@@ -303,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: