From: Daniel Trnka <redacted>
Date: Sun, 15 Sep 2019 07:51:26 +0000 (+0200)
Subject: build: use sdar instead of deprecated sdcclib
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.7~4
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=4e52e8a1fa6be86fed185389a1455cd20cc81463;p=sigrok-firmware-fx2lafw.git

build: use sdar instead of deprecated sdcclib

This fixes bug #1404
---

diff --git a/Makefile.am b/Makefile.am
index 5d751f1a..aa6c3e64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -334,11 +334,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)
diff --git a/configure.ac b/configure.ac
index b3c7f3eb..ae165f49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,9 +37,9 @@ AC_CHECK_PROGS([SDCC], [sdcc sdcc-sdcc])
 AS_IF([test "x$SDCC" = x],
 	[AC_MSG_ERROR([cannot find sdcc.])])
 
-AC_CHECK_PROGS([SDCCLIB], [sdcclib sdcc-sdcclib])
-AS_IF([test "x$SDCCLIB" = x],
-	[AC_MSG_ERROR([cannot find sdcclib.])])
+AC_CHECK_PROGS([SDAR], [sdar sdcc-sdar])
+AS_IF([test "x$SDAR" = x],
+	[AC_MSG_ERROR([cannot find sdar.])])
 
 sf_sdcc_version=`$SDCC --version | sed -n 's/.* \([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\) .*/\1/p;q' 2>&AS_MESSAGE_LOG_FD`
 AS_VERSION_COMPARE([$sf_sdcc_version], [3.4.0],