X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=e2594610293c9c508e95478ef92bc792872ec534;hb=ad3c6cf0d9c00fed811d34ea343cb5ba1c6002c4;hp=d3c984294424cc8f4b40e2c0eb4200718a7818d3;hpb=37521a3b07b1dd757e1cef9b6357a23d477ee303;p=sigrok-firmware-fx2lafw.git

diff --git a/Makefile.am b/Makefile.am
index d3c98429..e2594610 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,9 @@ dirstamps = \
 	hw/sigrok-fx2-16ch/$(dirstamp) \
 	hw/hantek-6022be/$(dirstamp) \
 	hw/hantek-6022bl/$(dirstamp) \
-	hw/sainsmart-dds120/$(dirstamp)
+	hw/sainsmart-dds120/$(dirstamp) \
+	hw/yixingdianzi-mdso/$(dirstamp) \
+	hw/instrustar-isds205b/$(dirstamp)
 
 # Final firmware files
 firmware_binaries = \
@@ -64,7 +66,9 @@ firmware_binaries = \
 	hw/sigrok-fx2-16ch/fx2lafw-sigrok-fx2-16ch.fw \
 	hw/hantek-6022be/fx2lafw-hantek-6022be.fw \
 	hw/hantek-6022bl/fx2lafw-hantek-6022bl.fw \
-	hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.fw
+	hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.fw \
+	hw/yixingdianzi-mdso/fx2lafw-yixingdianzi-mdso.fw \
+	hw/instrustar-isds205b/fx2lafw-instrustar-isds205b.fw
 
 fx2lafw_headers = \
 	include/command.h \
@@ -94,10 +98,18 @@ hantek_6022bl_headers = $(scope_headers)
 hantek_6022bl_sources = hw/hantek-6022bl/fw.c
 hantek_6022bl_objects = hw/hantek-6022bl/fw.rel
 
+instrustar_isds205b_headers = $(scope_headers)
+instrustar_isds205b_sources = hw/instrustar-isds205b/fw.c
+instrustar_isds205b_objects = hw/instrustar-isds205b/fw.rel
+
 sainsmart_dds120_headers = $(scope_headers)
 sainsmart_dds120_sources = hw/sainsmart-dds120/fw.c
 sainsmart_dds120_objects = hw/sainsmart-dds120/fw.rel
 
+yixingdianzi_mdso_headers = $(scope_headers)
+yixingdianzi_mdso_sources = hw/yixingdianzi-mdso/fw.c
+yixingdianzi_mdso_objects = hw/yixingdianzi-mdso/fw.rel
+
 fx2lib_headers = \
 	fx2lib/include/autovector.h \
 	fx2lib/include/delay.h \
@@ -238,12 +250,21 @@ hw_sources = \
 	hw/sigrok-fx2-16ch/dscr.a51 \
 	hw/hantek-6022be/dscr.a51 \
 	hw/hantek-6022bl/dscr.a51 \
-	hw/sainsmart-dds120/dscr.a51
+	hw/sainsmart-dds120/dscr.a51 \
+	hw/yixingdianzi-mdso/dscr.a51 \
+	hw/instrustar-isds205b/dscr.a51
 
 firmwaredir = $(datadir)/sigrok-firmware
 firmware_DATA = $(firmware_binaries)
 
-dist_noinst_DATA = $(fx2lafw_headers) $(fx2lafw_sources) $(hantek_6022be_headers) $(hantek_6022be_sources) $(hantek_6022bl_headers) $(hantek_6022bl_sources) $(sainsmart_dds120_sources) $(sainsmart_dds120_headers) $(fx2lib_headers) $(fx2lib_sources) $(fx2lib_ints_sources) $(hw_sources)
+dist_noinst_DATA = \
+	$(fx2lafw_headers) $(fx2lafw_sources) \
+	$(hantek_6022be_headers) $(hantek_6022be_sources) \
+	$(hantek_6022bl_headers) $(hantek_6022bl_sources) \
+	$(sainsmart_dds120_sources) $(sainsmart_dds120_headers) \
+	$(yixingdianzi_mdso_sources) $(yixingdianzi_mdso_headers) \
+	$(instrustar_isds205b_headers) $(instrustar_isds205b_sources) \
+	$(fx2lib_headers) $(fx2lib_sources) $(fx2lib_ints_sources) $(hw_sources)
 dist_noinst_SCRIPTS = autogen.sh
 
 MOSTLYCLEANFILES = *.asm fx2lib/lib/*.asm hw/**/*.asm fx2lib/lib/*.lib fx2lib/lib/interrupts/*.asm fx2lib/lib/interrupts/*.lib
@@ -298,6 +319,7 @@ $(fx2lafw_objects): $(fx2lafw_headers)
 $(hantek_6022be_objects): $(hantek_6022be_headers)
 $(fx2lib_objects): fx2lib/lib/$(dirstamp) $(fx2lib_headers)
 $(fx2lib_ints_objects): fx2lib/lib/interrupts/$(dirstamp) $(fx2lib_headers)
+$(instrustar_isds205b_objects): $(instrustar_isds205b_headers)
 
 hw/braintechnology-usb-lps/dscr.rel: hw/braintechnology-usb-lps/$(dirstamp) include/dscr.inc
 hw/cwav-usbeeax/dscr.rel: hw/cwav-usbeeax/$(dirstamp) include/dscr.inc
@@ -311,6 +333,8 @@ hw/sigrok-fx2-16ch/dscr.rel: hw/sigrok-fx2-16ch/$(dirstamp) include/dscr.inc
 hw/hantek-6022be/dscr.rel: hw/hantek-6022be/$(dirstamp) include/dscr_scope.inc
 hw/hantek-6022bl/dscr.rel: hw/hantek-6022bl/$(dirstamp) include/dscr_scope.inc
 hw/sainsmart-dds120/dscr.rel: hw/sainsmart-dds120/$(dirstamp) include/dscr_scope.inc
+hw/yixingdianzi-mdso/dscr.rel: hw/yixingdianzi-mdso/$(dirstamp) include/dscr_scope.inc
+hw/instrustar-isds205b/dscr.rel: hw/instrustar-isds205b/$(dirstamp) include/dscr_scope.inc
 
 
 # Create build subdirectories
@@ -320,11 +344,11 @@ $(dirstamps):
 
 fx2lib/lib/fx2.lib: $(fx2lib_objects)
 	-$(AM_V_at)rm -f $@
-	$(AM_V_GEN)$(SDCCLIB) $@ $(fx2lib_objects)
+	$(AM_V_GEN)$(SDAR) -rc $@ $(fx2lib_objects)
 
 fx2lib/lib/interrupts/ints.lib: $(fx2lib_ints_objects)
 	-$(AM_V_at)rm -f $@
-	$(AM_V_GEN)$(SDCCLIB) $@ $(fx2lib_ints_objects)
+	$(AM_V_GEN)$(SDAR) -rc $@ $(fx2lib_ints_objects)
 
 hw/braintechnology-usb-lps/fx2lafw-braintechnology-usb-lps.ihx: hw/braintechnology-usb-lps/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
 	$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS) -o $@ hw/braintechnology-usb-lps/dscr.rel $(fx2lafw_objects) $(fx2lib_libs)
@@ -359,9 +383,15 @@ hw/hantek-6022be/fx2lafw-hantek-6022be.ihx: hw/hantek-6022be/dscr.rel $(hantek_6
 hw/hantek-6022bl/fx2lafw-hantek-6022bl.ihx: hw/hantek-6022bl/dscr.rel $(hantek_6022bl_objects) $(fx2lib_libs)
 	$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@ hw/hantek-6022bl/dscr.rel $(hantek_6022bl_objects) $(fx2lib_libs)
 
+hw/instrustar-isds205b/fx2lafw-instrustar-isds205b.ihx: hw/instrustar-isds205b/dscr.rel $(instrustar_isds205b_objects) $(fx2lib_libs)
+	$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@ hw/instrustar-isds205b/dscr.rel $(instrustar_isds205b_objects) $(fx2lib_libs)
+
 hw/sainsmart-dds120/fx2lafw-sainsmart-dds120.ihx: hw/sainsmart-dds120/dscr.rel $(sainsmart_dds120_objects) $(fx2lib_libs)
 	$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@ hw/sainsmart-dds120/dscr.rel $(sainsmart_dds120_objects) $(fx2lib_libs)
 
+hw/yixingdianzi-mdso/fx2lafw-yixingdianzi-mdso.ihx: hw/yixingdianzi-mdso/dscr.rel $(yixingdianzi_mdso_objects) $(fx2lib_libs)
+	$(AM_V_GEN)$(SDCC) -mmcs51 $(SDCC_LINK_FLAGS_SCOPE) -o $@ hw/yixingdianzi-mdso/dscr.rel $(yixingdianzi_mdso_objects) $(fx2lib_libs)
+
 .a51.rel:
 	$(SF_V_SDAS)$(SDAS8051) -glos $(as_includes) $@ $<