Use makebin if objcopy is not available.

[sigrok-firmware-fx2lafw.git] / fx2lib / lib / fx2.mk

diff --git a/fx2lib/lib/fx2.mk b/fx2lib/lib/fx2.mk
index 9e5441831e386afea51ace6ff76e091e8daa4da1..b001b932a82519d705d9d54ab08ce9d48d385698 100644 (file)
--- a/fx2lib/lib/fx2.mk
+++ b/fx2lib/lib/fx2.mk
@@ -36,15 +36,15 @@
 #
 
 # The sdcc 8051 assembler binary has/had different names.
-ifneq ($(shell which sdas8051),)
+ifneq ($(shell which sdas8051 2>/dev/null),)
 # Newer sdcc, Debian / Ubuntu
 SDAS8051 = sdas8051
 endif
-ifneq ($(shell which sdcc-sdas8051),)
+ifneq ($(shell which sdcc-sdas8051 2>/dev/null),)
 # Newer sdcc, Fedora
 SDAS8051 = sdcc-sdas8051
 endif
-ifneq ($(shell which asx8051),)
+ifneq ($(shell which asx8051 2>/dev/null),)
 # Older sdcc
 SDAS8051 = asx8051
 endif
@@ -82,7 +82,7 @@ bix: $(BUILDDIR)/$(BASENAME).bix
 iic: $(BUILDDIR)/$(BASENAME).iic
 
 $(FX2LIBDIR)/lib/fx2.lib: $(FX2LIBDIR)/lib/*.c $(FX2LIBDIR)/lib/*.a51
-       make -C $(FX2LIBDIR)/lib
+       $(MAKE) -C $(FX2LIBDIR)/lib
 
 $(BUILDDIR):
        mkdir -p $(BUILDDIR)
@@ -111,5 +111,5 @@ clean:
        rm -f $(BUILDDIR)/*.{asm,ihx,lnk,lst,map,mem,rel,rst,sym,adb,cdb,bix}
 
 clean-all: clean
-       make -C $(FX2LIBDIR)/lib clean
+       $(MAKE) -C $(FX2LIBDIR)/lib clean